comparison mercurial/templatefilters.py @ 48588: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 d4ba4d51f85f
children 6000f5b25c9b
comparison
equal deleted inserted replaced
48587:3c8cc987672e 48588:402a6b6173e9