diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-11 16:59:49 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-11 16:59:49 -0400 |
| commit | 05f2d344a2933fdaf7422bba811bb8670c0d23b5 (patch) | |
| tree | 831bcdab3578f0420fb12d655d8986ae8607f7f4 /Command/ResolveMerge.hs | |
| parent | 88a52a5c74e5035c33533c65819d284eb9d3ac5e (diff) | |
resolvemerge: finish up by committing
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 |