diff options
Diffstat (limited to 'Command/Sync.hs')
| -rw-r--r-- | Command/Sync.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index 9923d6dfd..96aae888b 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -271,7 +271,8 @@ resolveMerge' u makelink (Just key) = do let dest = mergeFile file key l <- inRepo $ gitAnnexLink dest key - replaceFile dest $ addAnnexLink l + replaceFile dest $ makeAnnexLink l + stageSymlink dest =<< hashSymlink l whenM (isDirect) $ toDirect key dest makelink _ = noop |