diff tests/test-wireproto-clientreactor.py @ 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 89a2afe31e82
children 6000f5b25c9b
line wrap: on
line diff