summaryrefslogtreecommitdiff
path: root/Command/Sync.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-07 15:02:11 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-07 15:02:11 -0400
commit39933fd1b6408e08549af1f9e852bf711ccf4ad8 (patch)
treeb0cee60f9393c09a89e634ea3e96872a965a6b25 /Command/Sync.hs
parent7044c30d565dc1555f719bb46848c1316c1f838e (diff)
sync: When there are merge conflicts that get automatically resolved, exit nonzero at the end.
Diffstat (limited to 'Command/Sync.hs')
-rw-r--r--Command/Sync.hs2
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