diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-11 16:56:19 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-11 16:56:19 -0400 |
| commit | 88a52a5c74e5035c33533c65819d284eb9d3ac5e (patch) | |
| tree | d50627fb021c88efcb5a2908744798b1e0858eac /debian | |
| parent | 2a727e8c5f8d003af7102ea7de22e45a5faec421 (diff) | |
Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files.
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.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 39642b575..0b15e7754 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 |