diff hgweb.cgi @ 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 c102b704edb5
children d5cd1fd690f3
line wrap: on
line diff