mercurial/commands.py
changeset 44398 ddbc296a1f48
parent 44367 9dab3fa64325
child 44411 1e508097f570
--- a/mercurial/commands.py	Wed Feb 26 10:54:17 2020 -0800
+++ b/mercurial/commands.py	Wed Feb 26 11:00:50 2020 -0800
@@ -4909,9 +4909,7 @@
     with ui.configoverride(overrides, b'merge'):
         force = opts.get(b'force')
         labels = [b'working copy', b'merge rev']
-        return hg.merge(
-            repo, node, force=force, mergeforce=force, labels=labels
-        )
+        return hg.merge(repo, node, force=force, labels=labels)
 
 
 statemod.addunfinished(