diff options
Diffstat (limited to 'Command/ResolveMerge.hs')
| -rw-r--r-- | Command/ResolveMerge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/ResolveMerge.hs b/Command/ResolveMerge.hs index 12fe8cfd3..8742a1104 100644 --- a/Command/ResolveMerge.hs +++ b/Command/ResolveMerge.hs @@ -29,7 +29,7 @@ start = do let merge_head = d </> "MERGE_HEAD" them <- fromMaybe (error nomergehead) . extractSha <$> liftIO (readFile merge_head) - ifM (resolveMerge (Just us) them) + ifM (resolveMerge (Just us) them False) ( do void $ commitResolvedMerge Git.Branch.ManualCommit next $ next $ return True |