test_terminal: ensure redirections work reliably

diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh
index c50ee295a7bc0e8df74aa5913999b5900a07f2f8..1cd649e245e49735afa539ab0e982036154c4797 100755 (executable)
--- a/t/t6031-merge-recursive.sh
+++ b/t/t6031-merge-recursive.sh
@@ -2,11 +2,7 @@
 
 test_description='merge-recursive: handle file mode'
 . ./test-lib.sh
-
-if ! test "$(git config --bool core.filemode)" = false
-then
-       test_set_prereq FILEMODE
-fi
+. "$TEST_DIRECTORY"/lib-prereq-FILEMODE.sh
 
 test_expect_success 'mode change in one branch: keep changed version' '
        : >file1 &&
@@ -57,7 +53,7 @@ test_expect_success FILEMODE 'verify executable bit on file' '
        test -x file2
 '
 
-test_expect_failure 'merging with triple rename across D/F conflict' '
+test_expect_success 'merging with triple rename across D/F conflict' '
        git reset --hard HEAD &&
        git checkout -b main &&
        git rm -rf . &&