Merge branch 'tq/git-ssh-command'

diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh
index c8bd6da0cb060e36ff092b2773cdcd310c46e105..6464a16a192f495c5aab5ec1af17d3e17acaded6 100755 (executable)
--- a/t/t6031-merge-recursive.sh
+++ b/t/t6031-merge-recursive.sh
@@ -2,7 +2,6 @@
 
 test_description='merge-recursive: handle file mode'
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/lib-prereq-FILEMODE.sh
 
 test_expect_success 'mode change in one branch: keep changed version' '
        : >file1 &&