Merge branch 'rr/doc-content-type'

diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh
index bd75e0e6430ff6e536f0b10d28cc4793d0f7fe6c..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 &&