on second thought, don't change sync to exit nonzero on successful conflicted merge resolution

For one thing, that breaks the test suite. May revisit later.

1 files changed, 1 insertions, 1 deletions

diff --git a/Command/Sync.hs b/Command/Sync.hs
index e5ab4cf4b..c41f46f8a 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -276,7 +276,7 @@ mergeFrom branch = do
 		return r
 	runmerge a = ifM a
 		( return True
-		, void resolveMerge >> return False
+		, resolveMerge
 		)
 
 {- Resolves a conflicted merge. It's important that any conflicts be