Mercurial > hg

diff tests/test-issue586.t @ 48516: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 eb586ed5d8ce
children
line wrap: on
line diff