diff tests/test-shelve2.t @ 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 bcc4820242cf
children 74fb1842f8b9 f0a3aaa07d6a
line wrap: on
line diff