Mercurial > public > mercurial-scm > hg-stable
diff tests/tinyproxy.py @ 48610:402a6b6173e9
rebase: set custom conflict label for base commit
Differential Revision: https://phab.mercurial-scm.org/D12020
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 18 Jan 2022 14:57:15 -0800 |
parents | 23f5ed6dbcb1 |
children | b5fe10b3c9f5 6000f5b25c9b |