summaryrefslogtreecommitdiff
path: root/t/t7605-merge-resolve.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t7605-merge-resolve.sh')
-rwxr-xr-xt/t7605-merge-resolve.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t7605-merge-resolve.sh b/t/t7605-merge-resolve.sh
index 5d56c38546..62d935d31c 100755
--- a/t/t7605-merge-resolve.sh
+++ b/t/t7605-merge-resolve.sh
@@ -4,6 +4,7 @@ test_description='git merge
Testing the resolve strategy.'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '