diff tests/tinyproxy.py @ 48590:7e503eff3c76

update: set custom conflict label for base commit Differential Revision: https://phab.mercurial-scm.org/D12022
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 18 Jan 2022 13:23:49 -0800
parents 23f5ed6dbcb1
children 6000f5b25c9b b5fe10b3c9f5
line wrap: on
line diff