diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-20 13:24:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-20 13:24:08 -0800 |
| commit | 1b048b197d6c183b69ad0914da127321c1e6b6a6 (patch) | |
| tree | de56d4018232789d79a2b07e779f728ce34a2c2a | |
| parent | 3fabe9966b478f92cecdec9012dcb8bda9e17d25 (diff) | |
| parent | 5cd7fadc076880c48a27fd4e5e70844f127ceb99 (diff) | |
| download | git-1b048b197d6c183b69ad0914da127321c1e6b6a6.tar.gz git-1b048b197d6c183b69ad0914da127321c1e6b6a6.tar.xz | |
Merge branch 'jc/checkout-m-twoway'
* jc/checkout-m-twoway:
t/t2023-checkout-m.sh: fix use of test_must_fail
| -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 1a40ce02e..7e1898513 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 |