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
--- a/tests/test-merge-subrepos.t Tue Oct 03 12:49:28 2017 -0700
+++ b/tests/test-merge-subrepos.t Tue Oct 03 13:05:58 2017 -0700
@@ -60,6 +60,7 @@
$ hg id --config extensions.blackbox= --config blackbox.dirty=True
9bfe45a197d7+ tip
$ cat .hg/blackbox.log
+ * @9bfe45a197d7b0ab09bf287729dd57e9619c9da5+ (*)> serve --cmdserver chgunix * (glob) (chg !)
* @9bfe45a197d7b0ab09bf287729dd57e9619c9da5+ (*)> id (glob)
* @9bfe45a197d7b0ab09bf287729dd57e9619c9da5+ (*)> id --config *extensions.blackbox=* --config *blackbox.dirty=True* exited 0 * (glob)