changeset 48758 | 7dad4665d223 |
parent 48755 | 6ae3c97a0919 |
child 48875 | 6000f5b25c9b |
--- 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.