Mercurial > public > mercurial-scm > hg-stable
diff tests/tinyproxy.py @ 48604:f970bc616ebc
filemerge: remove unused arguments from `_merge()`
Differential Revision: https://phab.mercurial-scm.org/D12014
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 20 Jan 2022 11:17:09 -0800 |
parents | 23f5ed6dbcb1 |
children | b5fe10b3c9f5 6000f5b25c9b |