sync: When there are merge conflicts that get automatically resolved, exit nonzero at the end.
This commit is contained in:
parent
365ecb6c2d
commit
4f373503f2
3 changed files with 13 additions and 1 deletions
|
@ -276,7 +276,7 @@ mergeFrom branch = do
|
|||
return r
|
||||
runmerge a = ifM a
|
||||
( return True
|
||||
, resolveMerge
|
||||
, void resolveMerge >> return False
|
||||
)
|
||||
|
||||
{- Resolves a conflicted merge. It's important that any conflicts be
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue