mercurial/hg.py

--- a/mercurial/hg.py	Fri Jan 17 21:22:23 2020 +0300
+++ b/mercurial/hg.py	Fri Jan 24 15:28:37 2020 -0800
@@ -1137,11 +1137,12 @@
 
 
 def merge(
-    repo, node, force=False, remind=True, labels=None,
+    ctx, force=False, remind=True, labels=None,
 ):
     """Branch merge with node, resolving changes. Return true if any
     unresolved conflicts."""
-    stats = mergemod.merge(repo[node], force=force, labels=labels)
+    repo = ctx.repo()
+    stats = mergemod.merge(ctx, force=force, labels=labels)
     _showstats(repo, stats)
     if stats.unresolvedcount:
         repo.ui.status(