mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style

Browse source
This commit is contained in:
Joey Hess 2014-03-04 22:55:40 -04:00
parent 74f94d21fc
commit 8ee3b47d2b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Annex/AutoMerge.hs
View file

@ -110,12 +110,12 @@ resolveMerge' (Just us) them u = do
kthem <- getkey LsFiles.valThem LsFiles.valThem kthem <- getkey LsFiles.valThem LsFiles.valThem
case (kus, kthem) of case (kus, kthem) of
-- Both sides of conflict are annexed files -- Both sides of conflict are annexed files
(Just keyUs, Just keyThem) -> resolveby $ (Just keyUs, Just keyThem)
if keyUs == keyThem | keyUs /= keyThem -> resolveby $ do
then makelink keyUs makelink keyUs
else do makelink keyThem
makelink keyUs | otherwise -> resolveby $
makelink keyThem makelink keyUs
-- Our side is annexed file, other side is not. -- Our side is annexed file, other side is not.
(Just keyUs, Nothing) -> resolveby $ do (Just keyUs, Nothing) -> resolveby $ do
graftin them file graftin them file