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

@@ -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