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

diff --git a/t/lib-terminal.sh b/t/lib-terminal.sh
index 58d911d21b894ba05e878e6efbc234071795c600..737df289a1450b80aed58b52a59cf00eb2d77da3 100644 (file)
--- a/t/lib-terminal.sh
+++ b/t/lib-terminal.sh
@@ -19,7 +19,7 @@ test_expect_success PERL 'set up terminal for tests' '
        then
                :
        elif
-               "$PERL_PATH" "$TEST_DIRECTORY"/test-terminal.perl \
+               perl "$TEST_DIRECTORY"/test-terminal.perl \
                        sh -c "test -t 1 && test -t 2"
        then
                test_set_prereq TTY &&
@@ -29,7 +29,7 @@ test_expect_success PERL 'set up terminal for tests' '
                                echo >&4 "test_terminal: need to declare TTY prerequisite"
                                return 127
                        fi
-                       "$PERL_PATH" "$TEST_DIRECTORY"/test-terminal.perl "$@"
+                       perl "$TEST_DIRECTORY"/test-terminal.perl "$@"
                }
        fi
 '