diff options
Diffstat (limited to 'Command/ResolveMerge.hs')
| -rw-r--r-- | Command/ResolveMerge.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Command/ResolveMerge.hs b/Command/ResolveMerge.hs index b1091e981..a50e2aa9d 100644 --- a/Command/ResolveMerge.hs +++ b/Command/ResolveMerge.hs @@ -30,7 +30,9 @@ start = do them <- fromMaybe (error nomergehead) . extractSha <$> liftIO (readFile merge_head) ifM (resolveMerge (Just us) them) - ( next $ next $ return True + ( do + void $ commitResolvedMerge Git.Branch.ManualCommit + next $ next $ return True , error "Merge conflict could not be automatically resolved." ) where |