diff options
| -rw-r--r-- | Command/Sync.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index d6f1022cc..9923d6dfd 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -302,7 +302,7 @@ mergeFile file key | otherwise = go $ shortHash $ key2file key where varmarker = ".variant-" - doubleconflict = varmarker `isSuffixOf` (dropExtension file) + doubleconflict = varmarker `isInfixOf` file go v = takeDirectory file </> dropExtension (takeFileName file) ++ varmarker ++ v 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 |