diff options
Diffstat (limited to 't/t2023-checkout-m.sh')
| -rwxr-xr-x | t/t2023-checkout-m.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/t/t2023-checkout-m.sh b/t/t2023-checkout-m.sh index 1a40ce02e5..7e18985134 100755 --- a/t/t2023-checkout-m.sh +++ b/t/t2023-checkout-m.sh @@ -17,7 +17,9 @@ test_expect_success setup ' test_commit added_in_topic each.txt in_topic ' -test_must_fail git merge master +test_expect_success 'git merge master' ' + test_must_fail git merge master +' clean_branchnames () { # Remove branch names after conflict lines |