diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-26 17:42:15 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-26 17:42:15 -0400 |
| commit | 083dd734e07400a9653977ffe2afb95dc52e4646 (patch) | |
| tree | be301043d525a34d646d0bc5fe25acf8a1895367 /debian | |
| parent | 092fba6499ea4dfb7c30c32cec36070a1072023b (diff) | |
sync: Fix double merge conflict resolution handling.
Ie, when there'a a conflicted merge we may get foo.variant-xxxx
created in a merge. If a second merge conflict occurs on that new file,
it was not falling back to putting in the whole key (which should stop
the merge conflicts happening for good, but is ugly).
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index e0db3d655..29c4d5d6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ git-annex (4.20130522) UNRELEASED; urgency=low like with ssh remotes. * content: New command line way to view and configure a repository's preferred content settings. + * sync: Fix double merge conflict resolution handling. -- Joey Hess <joeyh@debian.org> Tue, 21 May 2013 18:22:46 -0400 |