diff options
Diffstat (limited to 'Annex/AutoMerge.hs')
| -rw-r--r-- | Annex/AutoMerge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index 92cccc004..f0f183dfb 100644 --- a/Annex/AutoMerge.hs +++ b/Annex/AutoMerge.hs @@ -134,7 +134,7 @@ resolveMerge' (Just us) them u = do makelink key = do let dest = variantFile file key - l <- inRepo $ gitAnnexLink dest key + l <- calcRepo $ gitAnnexLink dest key replacewithlink dest l stageSymlink dest =<< hashSymlink l |