Mercurial > public > mercurial-scm > hg-stable

diff mercurial/ancestor.py @ 48586:2dbee604a4f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: clarify names of functions that render conflict markers Differential Revision: https://phab.mercurial-scm.org/D11975
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 11 Jan 2022 16:54:42 -0800
parents d4ba4d51f85f
children 6000f5b25c9b
line wrap: on
line diff