--- a/mercurial/hg.py Mon Feb 01 20:28:32 2016 -0800
+++ b/mercurial/hg.py Mon Feb 01 20:28:32 2016 -0800
@@ -671,10 +671,10 @@
_showstats(repo, stats, quietempty)
return stats[3] > 0
-def merge(repo, node, force=None, remind=True):
+def merge(repo, node, force=None, remind=True, mergeforce=False):
"""Branch merge with node, resolving changes. Return true if any
unresolved conflicts."""
- stats = mergemod.update(repo, node, True, force)
+ stats = mergemod.update(repo, node, True, force, mergeforce=mergeforce)
_showstats(repo, stats)
if stats[3]:
repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "