summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-06-27 18:09:11 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-06-27 18:09:11 -0400
commit2e501364d46b665242bc99c7dbf928b6e801ea36 (patch)
tree4530812db05a361c94c356a5b1687c4ef6389e50 /Command
parent8baff14054e65ecbe801eb66786a55fa5245cb30 (diff)
parent2d7ebc0582026bc1cadb8812861eb9a6467ba41d (diff)
Merge branch 'master' into assistant
Diffstat (limited to 'Command')
-rw-r--r--Command/Sync.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs
index b2bf24d55..dfaed5949 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -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