view tests/helper-runtests.sh @ 44378:ab632e27f296

tests: add `hg log -G` output when there are merge conflicts The next commit will change the behavior for these. I've used slightly different commands in the different tests to match the surrounding style. Differential Revision: https://phab.mercurial-scm.org/D8042
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 29 Jan 2020 14:42:54 -0800
parents 054bcdad6042
children
line wrap: on
line source

#
# Avoid interference from actual test env:

unset HGTEST_JOBS
unset HGTEST_TIMEOUT
unset HGTEST_PORT
unset HGTEST_SHELL