diff mercurial/commands.py @ 44398:ddbc296a1f48

merge: drop redundant mergeforce argument from hg.merge()

The only caller that passed a value for either `force` or `mergeforce`
passed the same value for both, so let's simplify the interface by
accepting only `force`.

Differential Revision: https://phab.mercurial-scm.org/D8167

--- 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(