summaryrefslogtreecommitdiff
path: root/Annex/AutoMerge.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Annex/AutoMerge.hs')
-rw-r--r--Annex/AutoMerge.hs6
1 files 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.