comparison mercurial/encoding.py @ 48749:9ee70e175fed

simplemerge: replace `**opts` passed to `simplemerge()` by keyword arguments The `simplemerge` module is library code; it should not get an unmodified `opts` dict from the `simplemerge` extension. Differential Revision: https://phab.mercurial-scm.org/D12152
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 10 Feb 2022 09:59:07 -0800
parents f1ed5c304f45
children 6000f5b25c9b
comparison
equal deleted inserted replaced
48746:18e69f224e4b 48749:9ee70e175fed