simplemerge: replace `**opts` passed to `simplemerge()` by keyword arguments...
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