Mercurial > hg
diff mercurial/templater.py @ 48589:a51c522c0064
merge: set custom conflict label for base commit
Differential Revision: https://phab.mercurial-scm.org/D12021
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 18 Jan 2022 15:04:55 -0800 |
parents | 2b76255a4f74 |
children | 6000f5b25c9b |