diff options
author | Joey Hess <joeyh@joeyh.name> | 2016-04-06 17:32:04 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2016-04-06 17:32:04 -0400 |
commit | 070b1a03392ab3962eb43f60f32fde5c1b9b70d2 (patch) | |
tree | b6097608e2e12c026ca05164fc81148ede79cc23 /Command/ResolveMerge.hs | |
parent | 2caa1330b3abb4bb2ac60eb8b144046d03a1287b (diff) |
fix auto merge conflict resolution when doing out of tree merge for adjusted branch
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 |