Mercurial > hg

diff tests/test-match.py @ 45447:e7c8a5030a90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: show number of ancestors in bid merge debug notes A good number of times, we don't generate an action for a file in manifestmerge() which can result in bid merge doing the wrong thing. Mentioning the number of ancestors from which we are bidding will help spot such cases where we are not returning an action. Differential Revision: https://phab.mercurial-scm.org/D8967
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 26 Aug 2020 17:24:22 +0530
parents 8f67735344ae
children 89a2afe31e82
line wrap: on
line diff