mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

typo

Browse source
This commit is contained in:
Joey Hess 2012-06-27 18:08:52 -04:00
parent c6d595674b
commit 2d7ebc0582
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Command/Sync.hs
View file

@ -252,7 +252,7 @@ mergeFile file key
| otherwise = go $ shortHash $ show key | otherwise = go $ shortHash $ show key
where where
varmarker = ".variant-" varmarker = ".variant-"
doubleconflict = vermarker `isSuffixOf` (dropExtension file) doubleconflict = varmarker `isSuffixOf` (dropExtension file)
go v = takeDirectory file go v = takeDirectory file
</> dropExtension (takeFileName file) </> dropExtension (takeFileName file)
++ varmarker ++ v ++ varmarker ++ v

2
doc/bugs/build_issue_with_8baff14054e65ecbe801eb66786a55fa5245cb30.mdwn
View file

@ -39,3 +39,5 @@ index b2bf24d..dfaed59 100644
-- --
1.7.11.1 1.7.11.1
</pre> </pre>
[[fixed|done]]