Mercurial > hg
comparison tests/test-dirstate-race.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 | e845537f6adb |
| children |
comparison
equal
deleted
inserted
replaced
| 48746:18e69f224e4b | 48749:9ee70e175fed |
|---|