##// END OF EJS Templates
test-merge-subrepos: make test compatible with chg...
test-merge-subrepos: make test compatible with chg The test checks the output of '.hg/blackbox.log' which will contain logs corresponding to chg in case chg is running. Therefore, this commit modifies the test to take chg into consideration while checking the blackbox.log contents. Test Plan: Ran the test 'test-merge-subrepos.t' with and without the '--chg' option. Differential Revision: https://phab.mercurial-scm.org/D925

File last commit:

r19426:e4318468 default
r34451:6981d120 default
Show More
common.txt
8 lines | 240 B | text/plain | TextLexer
.. Common link and substitution definitions.
.. |hg(1)| replace:: **hg**\ (1)
.. _hg(1): hg.1.html
.. |hgrc(5)| replace:: **hgrc**\ (5)
.. _hgrc(5): hgrc.5.html
.. |hgignore(5)| replace:: **hgignore**\ (5)
.. _hgignore(5): hgignore.5.html