diff options
Diffstat (limited to 't/t6418-merge-text-auto.sh')
| -rwxr-xr-x | t/t6418-merge-text-auto.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t6418-merge-text-auto.sh b/t/t6418-merge-text-auto.sh index 48a62cb855..41288a60ce 100755 --- a/t/t6418-merge-text-auto.sh +++ b/t/t6418-merge-text-auto.sh @@ -15,7 +15,6 @@ test_description='CRLF merge conflict across text=auto change GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME -TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b |