mercurial/hg.py
changeset 44399 a45ffad9ae98
parent 44398 ddbc296a1f48
child 44434 2f290136b7d6
--- a/mercurial/hg.py	Wed Feb 26 11:00:50 2020 -0800
+++ b/mercurial/hg.py	Wed Feb 26 10:40:31 2020 -0800
@@ -1141,14 +1141,7 @@
 ):
     """Branch merge with node, resolving changes. Return true if any
     unresolved conflicts."""
-    stats = mergemod.update(
-        repo,
-        node,
-        branchmerge=True,
-        force=force,
-        mergeforce=force,
-        labels=labels,
-    )
+    stats = mergemod.merge(repo[node], force=force, labels=labels)
     _showstats(repo, stats)
     if stats.unresolvedcount:
         repo.ui.status(