merge: drop now-unused "abort" argument from hg.merge()

Differential Revision: https://phab.mercurial-scm.org/D7997

mercurial/commands.py

@@ -4897,11 +4897,7 b' def merge(ui, repo, node=None, **opts):'
         force = opts.get(b'force')
         labels = [b'working copy', b'merge rev']
         return hg.merge(
-            repo,
-            node,
-            force=force,
-            mergeforce=force,
-            labels=labels,
+            repo, node, force=force, mergeforce=force, labels=labels
         )
 
 

mercurial/hg.py

@@ -1138,19 +1138,10 b' def updatetotally(ui, repo, checkout, br'
 
 
 def merge(
-    repo,
-    node,
-    force=None,
-    remind=True,
-    mergeforce=False,
-    labels=None,
-    abort=False,
+    repo, node, force=None, remind=True, mergeforce=False, labels=None,
 ):
     """Branch merge with node, resolving changes. Return true if any
     unresolved conflicts."""
-    if abort:
-        return abortmerge(repo.ui, repo)
-
     stats = mergemod.update(
         repo,
         node,

relnotes/next

@@ -14,3 +14,6 b''
 
  * The deprecated `ui.progress()` has now been deleted. Please use
    `ui.makeprogress()` instead.
+
+ * `hg.merge()` has lost its `abort` argument. Please call
+   `hg.abortmerge()` directly instead.