diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-14 14:36:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-14 14:36:48 -0400 |
| commit | f3539810a43863171f4f0d99885c6b306eb79c61 (patch) | |
| tree | 12e08aa6103d2cd15f52442a32556008c69a137f /Command/Sync.hs | |
| parent | 85c0a2f1e4c67854f1cfbcdb62db59ab97a8ac7f (diff) | |
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.
Diffstat (limited to 'Command/Sync.hs')
| -rw-r--r-- | Command/Sync.hs | 2 |
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 |