diff tests/test-clonebundles.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 9c4204b7f3e4
children 6fd9a17c32ab
line wrap: on
line diff