From 766336fcfef7150d3e4ec053b611343f1f080af0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 9 Jul 2014 15:39:19 -0400 Subject: fix build warning --- Annex/AutoMerge.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index 1c463003e..d587e03d1 100644 --- a/Annex/AutoMerge.hs +++ b/Annex/AutoMerge.hs @@ -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. -- cgit v1.2.3