Mercurial > public > mercurial-scm > hg-stable

diff mercurial/hg.py @ 44253:bd4f666b55a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: drop now-unused "abort" argument from hg.merge() Differential Revision: https://phab.mercurial-scm.org/D7997
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 24 Jan 2020 16:07:42 -0800
parents 2b6632d64328
children f546d2170b0f
line wrap: on
line diff
--- 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,