diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-29 17:02:14 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-29 17:02:14 -0400 |
| commit | 2d67628a5acbb9e77f9975e8139c52455704981f (patch) | |
| tree | 48a88ddcb5c9eb544e66f8d906c7350facbdc629 /Annex/AutoMerge.hs | |
| parent | 32919e3eb4ba3c3bc368f9f7b43d15e45d321016 (diff) | |
rename
Diffstat (limited to 'Annex/AutoMerge.hs')
| -rw-r--r-- | Annex/AutoMerge.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index 57f15e07c..35156eaff 100644 --- a/Annex/AutoMerge.hs +++ b/Annex/AutoMerge.hs @@ -167,10 +167,10 @@ resolveMerge' unstagedmap (Just us) them u = do makesymlink key dest = do l <- calcRepo $ gitAnnexLink dest key - replacewithlink dest l + replacewithsymlink dest l stageSymlink dest =<< hashSymlink l - replacewithlink dest link = ifM isDirect + replacewithsymlink dest link = ifM isDirect ( do d <- fromRepo gitAnnexMergeDir replaceFile (d </> dest) $ makeGitLink link @@ -211,7 +211,7 @@ resolveMerge' unstagedmap (Just us) them u = do Nothing -> noop Just sha -> do link <- catSymLinkTarget sha - replacewithlink item link + replacewithsymlink item link resolveby ks a = do {- Remove conflicted file from index so merge can be resolved. -} |