contrib/simplemerge
changeset 48758 7dad4665d223
parent 48755 6ae3c97a0919
child 48875 6000f5b25c9b
--- 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)