diff options
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/AutoMerge.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index 02a3fa753..2ed26b78f 100644 --- a/Annex/AutoMerge.hs +++ b/Annex/AutoMerge.hs @@ -110,12 +110,12 @@ resolveMerge' (Just us) them u = do kthem <- getkey LsFiles.valThem LsFiles.valThem case (kus, kthem) of -- Both sides of conflict are annexed files - (Just keyUs, Just keyThem) -> resolveby $ - if keyUs == keyThem - then makelink keyUs - else do - makelink keyUs - makelink keyThem + (Just keyUs, Just keyThem) + | keyUs /= keyThem -> resolveby $ do + makelink keyUs + makelink keyThem + | otherwise -> resolveby $ + makelink keyUs -- Our side is annexed file, other side is not. (Just keyUs, Nothing) -> resolveby $ do graftin them file |