summaryrefslogtreecommitdiff
path: root/Command/Sync.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-06-27 16:09:17 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-06-27 16:09:17 -0400
commit36ddb81df6938cd604ecccea52ae758f481fd79b (patch)
tree49c7e007f315b9efc34ac70d12b8cee804664179 /Command/Sync.hs
parent054ddda18a48abce03a1c0b50aef4eed714aa320 (diff)
use "variant" rather than "version"
While this word may be less familiar to some users, it avoids the connotation that version 2 is better than version 1, which is wrong when the two variants were conflicting.
Diffstat (limited to 'Command/Sync.hs')
-rw-r--r--Command/Sync.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs
index 5e63ee63a..06e1fd5c9 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -251,11 +251,11 @@ mergeFile file key
| doubleconflict = go $ show key
| otherwise = go $ shortHash $ show key
where
- vermarker = ".version-"
+ varmarker = ".variant-"
doubleconflict = vermarker `isSuffixOf` (dropExtension file)
go v = takeDirectory file
</> dropExtension (takeFileName file)
- ++ vermarker ++ v
+ ++ varmarker ++ v
++ takeExtension file
shortHash :: String -> String