summaryrefslogtreecommitdiffstats
path: root/t/t3309-notes-merge-auto-resolve.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t3309-notes-merge-auto-resolve.sh')
-rwxr-xr-xt/t3309-notes-merge-auto-resolve.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t3309-notes-merge-auto-resolve.sh b/t/t3309-notes-merge-auto-resolve.sh
index f55277f499..9bd5dbf341 100755
--- a/t/t3309-notes-merge-auto-resolve.sh
+++ b/t/t3309-notes-merge-auto-resolve.sh
@@ -5,7 +5,6 @@
test_description='Test notes merging with auto-resolving strategies'
-TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# Set up a notes merge scenario with all kinds of potential conflicts