Merge branch 'master' into assistant

This commit is contained in:
Joey Hess 2012-06-27 18:09:11 -04:00
commit 2e501364d4
3 changed files with 126 additions and 1 deletions

View file

@ -265,7 +265,7 @@ mergeFile file key
| otherwise = go $ shortHash $ show key
where
varmarker = ".variant-"
doubleconflict = vermarker `isSuffixOf` (dropExtension file)
doubleconflict = varmarker `isSuffixOf` (dropExtension file)
go v = takeDirectory file
</> dropExtension (takeFileName file)
++ varmarker ++ v