wip debug
This commit is contained in:
parent
08699487f1
commit
f1936f150d
166 changed files with 17619 additions and 15 deletions
11
README
Normal file
11
README
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
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.
|
||||
Loading…
Add table
Add a link
Reference in a new issue