Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.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 1850066f9e36
children 293cab97a766
line wrap: on
line diff
--- 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
         )