diff hgeditor @ 48612: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 1aee2ab0f902
children
line wrap: on
line diff