diff options
Diffstat (limited to 't/t6400-merge-df.sh')
| -rwxr-xr-x | t/t6400-merge-df.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t6400-merge-df.sh b/t/t6400-merge-df.sh index 27d6efdc9a..3de4ef6bd9 100755 --- a/t/t6400-merge-df.sh +++ b/t/t6400-merge-df.sh @@ -7,7 +7,6 @@ test_description='Test merge with directory/file conflicts' GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME -TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh test_expect_success 'prepare repository' ' |