diff options
Diffstat (limited to 't/t6036-recursive-corner-cases.sh')
| -rwxr-xr-x | t/t6036-recursive-corner-cases.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index 74e5920bc6..ef1c26ec58 100755 --- a/t/t6036-recursive-corner-cases.sh +++ b/t/t6036-recursive-corner-cases.sh @@ -495,7 +495,7 @@ test_expect_success 'setup differently handled merges of directory/file conflict test_write_lines 1 2 3 4 5 6 7 8 >a && git add a && git commit -m E3 && - git tag E3 + git tag E3 && git checkout C^0 && test_must_fail git merge B^0 && |