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

contrib/simplemerge

@@ -118,14 +118,11 b' try:'
     _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)

mercurial/filemerge.py

@@ -443,7 +443,7 b' def _premerge(repo, local, other, base, '
         ):
             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 b' def _merge(repo, local, other, base, mod'
         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())

mercurial/simplemerge.py

@@ -493,14 +493,11 b' class MergeInput(object):'
 
 
 def simplemerge(
-    ui,
     local,
     base,
     other,
     mode=b'merge',
-    quiet=False,
     allow_binary=False,
-    print_result=False,
 ):
     """Performs the simplemerge algorithm.