Mercurial > hg

comparison mercurial/merge.py @ 46543:f01696d45d1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-copies: add subcase titles for various "conflicting" information variant This make the transitions between case clearer. Differential Revision: https://phab.mercurial-scm.org/D10047
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 18 Feb 2021 13:49:55 +0100
parents dc00324e80f4
children e2f7b2695ba1
comparison
equal deleted inserted replaced
46542:f8888f5c8c50 46543:f01696d45d1e