revert change that broke test suite
Opened a new bug about it. This commit was sponsored by Ethan Aubin.
This commit is contained in:
parent
e88ab0c09d
commit
03dee56546
2 changed files with 13 additions and 28 deletions
6
doc/bugs/automerge_leaves_cruft_behind.mdwn
Normal file
6
doc/bugs/automerge_leaves_cruft_behind.mdwn
Normal file
|
@ -0,0 +1,6 @@
|
|||
Seeing `git-annex sync` after resolving a merge conflict between a
|
||||
directory and an annexed file leave behind
|
||||
files like `foo~refs_remotes_origin_master`, which are not checked into
|
||||
git.
|
||||
|
||||
Also happens with merge.directoryRenames=conflict --[[Joey]]
|
Loading…
Add table
Add a link
Reference in a new issue