comparison tests/test-convert-clonebranches.t @ 48516:59524cb1cd73

simplemerge: don't calculate conflict labels when resolving automatically Differential Revision: https://phab.mercurial-scm.org/D11903
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 07 Dec 2021 23:01:20 -0800
parents 5abc47d4ca6b
children 42d2b31cee0b
comparison
equal deleted inserted replaced
48515:bd27dad294b7 48516:59524cb1cd73