# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1644271624 28800
# Node ID 7dad4665d2239ee081afb1c8462ebf50db21a3f5
# Parent  af9f2c64302e8084b775f18cb96c0162255ac45f
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

diff -r af9f2c64302e -r 7dad4665d223 contrib/simplemerge
--- a/contrib/simplemerge	Tue Jan 18 13:22:55 2022 -0800
+++ b/contrib/simplemerge	Mon Feb 07 14:07:04 2022 -0800
@@ -118,14 +118,11 @@
     _verifytext(other_input, ui, quiet=quiet, allow_binary=allow_binary)
 
     merged_text, conflicts = simplemerge.simplemerge(
-        ui,
         local_input,
         base_input,
         other_input,
         mode,
-        quiet=True,
         allow_binary=allow_binary,
-        print_result=opts.get(b'print'),
     )
     if opts.get(b'print'):
         ui.fout.write(merged_text)
diff -r af9f2c64302e -r 7dad4665d223 mercurial/filemerge.py
--- a/mercurial/filemerge.py	Tue Jan 18 13:22:55 2022 -0800
+++ b/mercurial/filemerge.py	Mon Feb 07 14:07:04 2022 -0800
@@ -443,7 +443,7 @@
         ):
             return 1  # continue merging
         merged_text, conflicts = simplemerge.simplemerge(
-            ui, local, base, other, mode=mode
+            local, base, other, mode=mode
         )
         if not conflicts or premerge in validkeep:
             # fcd.flags() already has the merged flags (done in
@@ -492,7 +492,7 @@
         return True, True, False
     else:
         merged_text, conflicts = simplemerge.simplemerge(
-            ui, local, base, other, mode=mode
+            local, base, other, mode=mode
         )
         # fcd.flags() already has the merged flags (done in
         # mergestate.resolve())
diff -r af9f2c64302e -r 7dad4665d223 mercurial/simplemerge.py
--- 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.