--- a/mercurial/commands.py Thu Oct 18 10:11:08 2018 -0700
+++ b/mercurial/commands.py Thu Feb 09 09:17:40 2017 -0800
@@ -643,7 +643,9 @@
with dirstateguard.dirstateguard(repo, 'backout'):
overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
with ui.configoverride(overrides, 'backout'):
- stats = mergemod.update(repo, parent, True, True, node, False)
+ stats = mergemod.update(repo, parent, branchmerge=True,
+ force=True, ancestor=node,
+ mergeancestor=False)
repo.setparents(op1, op2)
hg._showstats(repo, stats)
if stats.unresolvedcount: