diff options
| author | Joey Hess <joey@kitenet.net> | 2014-03-04 22:55:40 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-04 22:55:40 -0400 |
| commit | 8ee3b47d2bae77c6a6f586cf1dec049adf165f61 (patch) | |
| tree | 920d113565bfd6adc9f934d784ed55dbe9cce76b /Annex/AutoMerge.hs | |
| parent | 74f94d21fc1e87abaf1b1d56d13732a4d3e09171 (diff) | |
style
Diffstat (limited to 'Annex/AutoMerge.hs')
| -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 02a3fa7531..2ed26b78fa 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 |