mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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
parent 3fabe9966b 5cd7fadc07
commit 1b048b197d
1 changed files with 3 additions and 1 deletions
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_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 () { clean_branchnames () {
# Remove branch names after conflict lines # Remove branch names after conflict lines