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

fix build warning

Browse source
This commit is contained in:
Joey Hess 2014-07-09 15:39:19 -04:00
parent 84186ee626
commit c75193e88b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Annex/AutoMerge.hs
View file

@ -134,11 +134,11 @@ resolveMerge' (Just us) them u = do
replacewithlink dest l
stageSymlink dest =<< hashSymlink l
replacewithlink file link = ifM isDirect
replacewithlink dest link = ifM isDirect
( do
d <- fromRepo gitAnnexMergeDir
replaceFile (d </> file) $ makeGitLink link
, replaceFile file $ makeGitLink link
replaceFile (d </> dest) $ makeGitLink link
, replaceFile dest $ makeGitLink link
)
{- Stage a graft of a directory or file from a branch.