From 39933fd1b6408e08549af1f9e852bf711ccf4ad8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 7 Nov 2013 15:02:11 -0400 Subject: sync: When there are merge conflicts that get automatically resolved, exit nonzero at the end. --- Command/Sync.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Command') 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 -- cgit v1.2.3