Mercurial > public > mercurial-scm > hg-stable

diff mercurial/dirstateguard.py @ 48553:59524cb1cd73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 222a42ac5b2d
children 6000f5b25c9b
line wrap: on
line diff