mercurial/merge.py
changeset 44399 a45ffad9ae98
parent 44394 5e3402a0b868
child 44452 9d2b2df2c2ba
--- a/mercurial/merge.py	Wed Feb 26 11:00:50 2020 -0800
+++ b/mercurial/merge.py	Wed Feb 26 10:40:31 2020 -0800
@@ -2590,6 +2590,23 @@
     return stats
 
 
+def merge(ctx, labels=None, force=False, wc=None):
+    """Merge another topological branch into the working copy.
+
+    force = whether the merge was run with 'merge --force' (deprecated)
+    """
+
+    return update(
+        ctx.repo(),
+        ctx.rev(),
+        labels=labels,
+        branchmerge=True,
+        force=force,
+        mergeforce=force,
+        wc=wc,
+    )
+
+
 def clean_update(ctx, wc=None):
     """Do a clean update to the given commit.