From 2d7ebc0582026bc1cadb8812861eb9a6467ba41d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 27 Jun 2012 18:08:52 -0400
Subject: typo

---
 Command/Sync.hs                                                         | 2 +-
 doc/bugs/build_issue_with_8baff14054e65ecbe801eb66786a55fa5245cb30.mdwn | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Command/Sync.hs b/Command/Sync.hs
index 06e1fd5c9..bdb5d47a7 100644
--- 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
diff --git a/doc/bugs/build_issue_with_8baff14054e65ecbe801eb66786a55fa5245cb30.mdwn b/doc/bugs/build_issue_with_8baff14054e65ecbe801eb66786a55fa5245cb30.mdwn
index 015226f7d..34c2eef5f 100644
--- 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]]
-- 
cgit v1.2.3