Mercurial > hg
diff tests/test-simplemerge.py @ 48432:f45a4a47f6a8
filemerge: inline `_filemerge()` into `filemerge()`
The caller is now trivial, so the indirection is pointless.
Differential Revision: https://phab.mercurial-scm.org/D11860
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 03 Dec 2021 22:45:35 -0800 |
| parents | 98e3a693061a |
| children | 374bf34c9ffd |