diff options
Diffstat (limited to 't/t3310-notes-merge-manual-resolve.sh')
| -rwxr-xr-x | t/t3310-notes-merge-manual-resolve.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh index 04866b89be..597df5ebc0 100755 --- a/t/t3310-notes-merge-manual-resolve.sh +++ b/t/t3310-notes-merge-manual-resolve.sh @@ -5,7 +5,6 @@ test_description='Test notes merging with manual conflict resolution' -TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh # Set up a notes merge scenario with different kinds of conflicts |