diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-27 18:08:52 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-27 18:08:52 -0400 |
| commit | 2d7ebc0582026bc1cadb8812861eb9a6467ba41d (patch) | |
| tree | 4146b5093f06291e40384a18f7a802a7c9730f4d | |
| parent | c6d595674bb1133c81d1c29a4ad637a7c162b3da (diff) | |
typo
| -rw-r--r-- | Command/Sync.hs | 2 | ||||
| -rw-r--r-- | doc/bugs/build_issue_with_8baff14054e65ecbe801eb66786a55fa5245cb30.mdwn | 2 |
2 files changed, 3 insertions, 1 deletions
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]] |