diff mercurial/filemerge.py @ 48758:7dad4665d223

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

--- 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())