development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-29 11:13:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'jc/checkout-m-twoway'

Browse source 
* jc/checkout-m-twoway:
  t/t2023-checkout-m.sh: fix use of test_must_fail
This commit is contained in:
Junio C Hamano 2011-12-20 13:24:08 -08:00
commit 1b048b197d
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
t/t2023-checkout-m.sh
View file

@ -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