diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-07 15:02:11 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-07 15:02:11 -0400 |
| commit | 39933fd1b6408e08549af1f9e852bf711ccf4ad8 (patch) | |
| tree | b0cee60f9393c09a89e634ea3e96872a965a6b25 /Command | |
| parent | 7044c30d565dc1555f719bb46848c1316c1f838e (diff) | |
sync: When there are merge conflicts that get automatically resolved, exit nonzero at the end.
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Sync.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index a37fcab98..beb1e1a39 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -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 |