comparison tests/test-stream-bundle-v2.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 bf11ff22a9af
children 6a68350ec2ef f7086f6173f8
comparison
equal deleted inserted replaced
48515:bd27dad294b7 48516:59524cb1cd73