mercurial/commands.py

--- a/mercurial/commands.py	Mon Feb 01 20:28:32 2016 -0800
+++ b/mercurial/commands.py	Mon Feb 01 20:28:32 2016 -0800
@@ -5242,7 +5242,8 @@
     try:
         # ui.forcemerge is an internal variable, do not document
         repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
-        return hg.merge(repo, node, force=opts.get('force'))
+        force = opts.get('force')
+        return hg.merge(repo, node, force=force, mergeforce=force)
     finally:
         ui.setconfig('ui', 'forcemerge', '', 'merge')