merge & sequencer: turn "Conflicts:" hint into a comment

diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 5c32288380bfd26d20574440c7f94d46dc89a56b..10be52beedb4058318555e096d51517f1c30ad9f 100755 (executable)
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -53,7 +53,8 @@ run_sub_test_lib_test () {
                # Pretend we're a test harness.  This prevents
                # test-lib from writing the counts to a file that will
                # later be summarized, showing spurious "failed" tests
-               export HARNESS_ACTIVE=t &&
+               HARNESS_ACTIVE=t &&
+               export HARNESS_ACTIVE &&
                cd "$name" &&
                cat >"$name.sh" <<-EOF &&
                #!$SHELL_PATH