Mercurial > hg-stable

diff mercurial/merge.py @ 37434:3fbd8b862d66

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: work around potential repo incompatibility test-run-tests.t invokes run-tests.py. But custom extensions providing new repo requirements may be in play and may not get inherited by the new run-tests.py. We ensure our repo is created with a vanilla config to mitigate extension-caused badness. Differential Revision: https://phab.mercurial-scm.org/D3114
author Gregory Szorc <gregory.szorc@gmail.com>
date Wed, 04 Apr 2018 17:33:59 -0700
parents daef13da66fe
children 7269b87f817c
line wrap: on
line diff