sync: When there are merge conflicts that get automatically resolved, exit nonzero at the end.

2013-11-07 15:02:11 -04:00 · 2013-11-07 15:02:11 -04:00 · 4f373503f2
commit 4f373503f2
parent 365ecb6c2d
3 changed files with 13 additions and 1 deletions
--- 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