Mercurial > public > mercurial-scm > hg-stable
diff mercurial/revlog.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 | ebac18733142 |
children | ccd9cb73125c c514936d92b4 |