aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6428-merge-conflicts-sparse.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t6428-merge-conflicts-sparse.sh')
-rwxr-xr-xt/t6428-merge-conflicts-sparse.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t6428-merge-conflicts-sparse.sh b/t/t6428-merge-conflicts-sparse.sh
index 9919c3fa7c..8a79bc2e92 100755
--- a/t/t6428-merge-conflicts-sparse.sh
+++ b/t/t6428-merge-conflicts-sparse.sh
@@ -22,6 +22,7 @@ test_description="merge cases"
# underscore notation is to differentiate different
# files that might be renamed into each other's paths.)
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-merge.sh