diff -r c59647c6694d -r 43c00ca887d1 mercurial/hg.py
--- a/mercurial/hg.py	Sat Dec 12 09:57:05 2015 -0800
+++ b/mercurial/hg.py	Mon Dec 14 18:54:03 2015 -0500
@@ -637,7 +637,7 @@
     When overwrite is set, changes are clobbered, merged else
 
     returns stats (see pydoc mercurial.merge.applyupdates)"""
-    return mergemod.update(repo, node, False, overwrite, None,
+    return mergemod.update(repo, node, False, overwrite,
                            labels=['working copy', 'destination'])
 
 def update(repo, node):
@@ -662,7 +662,7 @@
 def merge(repo, node, force=None, remind=True):
     """Branch merge with node, resolving changes. Return true if any
     unresolved conflicts."""
-    stats = mergemod.update(repo, node, True, force, False)
+    stats = mergemod.update(repo, node, True, force)
     _showstats(repo, stats)
     if stats[3]:
         repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "