12 lines
516 B
Text
12 lines
516 B
Text
|
This commit was made by jj, https://jj-vcs.dev/.
|
||
|
|
The commit contains file conflicts, and therefore looks wrong when used with plain
|
||
|
|
Git or other tools that are unfamiliar with jj.
|
||
|
|
|
||
|
|
The .jjconflict-* directories represent the different inputs to the conflict.
|
||
|
|
For details, see
|
||
|
|
https://docs.jj-vcs.dev/prerelease/git-compatibility/#format-mapping-details
|
||
|
|
|
||
|
|
If you see this file in your working copy, it probably means that you used a
|
||
|
|
regular `git` command to check out a conflicted commit. Use `jj abandon` to
|
||
|
|
recover.
|