mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files.

Browse source 
I think this is a git behavior change, but have not checked to be sure.
Conflict cruft used to look like $foo~HEAD, but now just $foo is left
behind as conflict cruft.

With test case.
This commit is contained in:
Joey Hess 2014-07-11 16:56:19 -04:00
parent cb66ca3a76
commit 61a35de433
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -11,6 +11,8 @@ git-annex (5.20140710) UNRELEASED; urgency=medium
it.
* resolvemerge: New plumbing command that runs the automatic merge conflict
resolver.
* Deal with change in git 2.0 that made indirect mode merge conflict
resolution leave behind old files.
-- Joey Hess <joeyh@debian.org> Wed, 09 Jul 2014 23:29:21 -0400