diff mercurial/obsolete.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 b1e1559f5a45
children 4507bc001365
line wrap: on
line diff