diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t8004-blame-with-conflicts.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t8004-blame-with-conflicts.sh b/t/t8004-blame-with-conflicts.sh index ba19ac127e..b4a260a0fc 100755 --- a/t/t8004-blame-with-conflicts.sh +++ b/t/t8004-blame-with-conflicts.sh @@ -66,8 +66,8 @@ test_expect_success \ git blame file2 ' -test_expect_success 'blame runs on conflicted file in stages 1,3' ' - git blame file1 +test_expect_success 'blame does not crash with conflicted file in stages 1,3' ' + test_must_fail git blame file1 ' test_done |