diff options
Diffstat (limited to 'Command/Sync.hs')
| -rw-r--r-- | Command/Sync.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index eb312c25b..a25f6a602 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -14,7 +14,6 @@ import qualified Remote import qualified Annex import qualified Annex.Branch import qualified Annex.Queue -import Annex.Content import Annex.Direct import Annex.CatFile import Annex.Link @@ -268,7 +267,7 @@ resolveMerge' u [Just SymlinkBlob, Nothing] makelink (Just key) = do let dest = mergeFile file key - l <- calcGitLink dest key + l <- inRepo $ gitAnnexLink dest key liftIO $ nukeFile dest addAnnexLink l dest whenM (isDirect) $ |