From 083dd734e07400a9653977ffe2afb95dc52e4646 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 26 May 2013 17:42:15 -0400 Subject: 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). --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') 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 Tue, 21 May 2013 18:22:46 -0400 -- cgit v1.2.3