diff tests/test-narrow-clone-no-ellipsis.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 5e6542143d40
children 7ee07e1a25c0
line wrap: on
line diff