diff tests/test-subrepo-recursion.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 377d8fc20e34
children 7e5be4a7cda7
line wrap: on
line diff