comparison contrib/phab-refresh-stack.sh @ 48553: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 9be5db6148fb
children fba2d7fab11e
comparison
equal deleted inserted replaced
48552:bd27dad294b7 48553:59524cb1cd73