diff options
Diffstat (limited to 't/t6031-merge-recursive.sh')
| -rwxr-xr-x | t/t6031-merge-recursive.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh index bd75e0e..1cd649e 100755 --- 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 && |