Merge branch 'sb/plug-leaks'

diff --git a/t/t8004-blame-with-conflicts.sh b/t/t8004-blame-with-conflicts.sh
index b4a260a0fc2b2bdd2c29e936cb988e5f86cdf0ca..9c353ab22276c052de054281dd57808d1826a355 100755 (executable)
--- a/t/t8004-blame-with-conflicts.sh
+++ b/t/t8004-blame-with-conflicts.sh
@@ -67,7 +67,7 @@ test_expect_success \
 '
 
 test_expect_success 'blame does not crash with conflicted file in stages 1,3' '
-       test_must_fail git blame file1
+       git blame file1
 '
 
 test_done