Mercurial > public > mercurial-scm > hg-stable
diff contrib/check-code.py @ 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 | b84fe613de33 |
children | df56e6bd37f6 |