summaryrefslogtreecommitdiff
path: root/t/t6438-submodule-directory-file-conflicts.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t6438-submodule-directory-file-conflicts.sh')
-rwxr-xr-xt/t6438-submodule-directory-file-conflicts.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t6438-submodule-directory-file-conflicts.sh b/t/t6438-submodule-directory-file-conflicts.sh
index 3594190af8..8df67a0ef9 100755
--- a/t/t6438-submodule-directory-file-conflicts.sh
+++ b/t/t6438-submodule-directory-file-conflicts.sh
@@ -2,7 +2,6 @@
test_description='merge can handle submodules'
-TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-submodule-update.sh