Mercurial > public > mercurial-scm > hg-stable
diff tests/test-convert-p4-filetypes.t @ 48610: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 | 5abc47d4ca6b |
children |