Mercurial > hg

diff mercurial/merge.py @ 48405:acdd4a42deaa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: use long version of the flag in the test This helps readability and searchability. Differential Revision: https://phab.mercurial-scm.org/D11848
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 03 Dec 2021 12:01:00 +0100
parents 6dc3dc5e9636
children fff5942d445f
line wrap: on
line diff