# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1579910862 28800
# Node ID bd4f666b55a7a7ed6487fc130b9b6c5033fa4642
# Parent  1850066f9e362529d197d569d89c4c2c7cb56069
merge: drop now-unused "abort" argument from hg.merge()

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

diff -r 1850066f9e36 -r bd4f666b55a7 mercurial/commands.py
--- a/mercurial/commands.py	Fri Jan 24 17:49:21 2020 -0800
+++ b/mercurial/commands.py	Fri Jan 24 16:07:42 2020 -0800
@@ -4897,11 +4897,7 @@
         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
         )
 
 
diff -r 1850066f9e36 -r bd4f666b55a7 mercurial/hg.py
--- a/mercurial/hg.py	Fri Jan 24 17:49:21 2020 -0800
+++ b/mercurial/hg.py	Fri Jan 24 16:07:42 2020 -0800
@@ -1138,19 +1138,10 @@
 
 
 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,
diff -r 1850066f9e36 -r bd4f666b55a7 relnotes/next
--- a/relnotes/next	Fri Jan 24 17:49:21 2020 -0800
+++ b/relnotes/next	Fri Jan 24 16:07:42 2020 -0800
@@ -14,3 +14,6 @@
 
  * 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.