Mercurial > public > mercurial-scm > hg-stable

diff mercurial/simplemerge.py @ 48761:7dad4665d223

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: remove now-unused arguments The `ui` argument is no longer needed now that we don't handle `--print` in the library code. Differential Revision: https://phab.mercurial-scm.org/D12151
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 07 Feb 2022 14:07:04 -0800
parents 6ae3c97a0919
children 6000f5b25c9b
line wrap: on
line diff
--- a/mercurial/simplemerge.py	Tue Jan 18 13:22:55 2022 -0800
+++ b/mercurial/simplemerge.py	Mon Feb 07 14:07:04 2022 -0800
@@ -493,14 +493,11 @@
 
 
 def simplemerge(
-    ui,
     local,
     base,
     other,
     mode=b'merge',
-    quiet=False,
     allow_binary=False,
-    print_result=False,
 ):
     """Performs the simplemerge algorithm.