typo

2012-06-27 18:08:52 -04:00 · 2012-06-27 18:08:52 -04:00 · 2d7ebc0582
commit 2d7ebc0582
parent c6d595674b
2 changed files with 3 additions and 1 deletions
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@ -252,7 +252,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
--- a/doc/bugs/build_issue_with_8baff14054e65ecbe801eb66786a55fa5245cb30.mdwn
+++ b/doc/bugs/build_issue_with_8baff14054e65ecbe801eb66786a55fa5245cb30.mdwn
@ -39,3 +39,5 @@ index b2bf24d..dfaed59 100644
 -- 
 1.7.11.1
 </pre>
+
+[[fixed|done]]