diff options
Diffstat (limited to 'Annex/AutoMerge.hs')
| -rw-r--r-- | Annex/AutoMerge.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index 91f8fc99e..078e69eec 100644 --- a/Annex/AutoMerge.hs +++ b/Annex/AutoMerge.hs @@ -217,9 +217,8 @@ resolveMerge' unstagedmap (Just us) them inoverlay u = do makepointer key dest destmode = do unless inoverlay $ - unlessM (reuseOldFile unstagedmap key file dest) $ do - r <- linkFromAnnex key dest destmode - case r of + unlessM (reuseOldFile unstagedmap key file dest) $ + linkFromAnnex key dest destmode >>= \case LinkAnnexFailed -> liftIO $ writePointerFile dest key destmode _ -> noop |