From 36ddb81df6938cd604ecccea52ae758f481fd79b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 27 Jun 2012 16:09:17 -0400 Subject: [PATCH] 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. --- Command/Sync.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Command/Sync.hs b/Command/Sync.hs index 5e63ee63ad..06e1fd5c92 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