From f3539810a43863171f4f0d99885c6b306eb79c61 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 14 Nov 2013 14:36:48 -0400 Subject: 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. --- 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 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 -- cgit v1.2.3