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
FROM centos:centos6
RUN yum install -y \
gcc \
gettext \
make \
python-devel \
python-docutils \
rpm-build \
tar
# For creating repo meta data
RUN yum install -y createrepo
# For python
RUN yum install -y \
bzip2-devel \
ncurses-devel \
openssl-devel \
readline-devel \
zlib-devel