Merge branch 'jc/checkout-m-twoway'
commit1b048b197d6c183b69ad0914da127321c1e6b6a6
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 21:24:08 +0000 (20 13:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 21:24:08 +0000 (20 13:24 -0800)
treede56d4018232789d79a2b07e779f728ce34a2c2a
parent3fabe9966b478f92cecdec9012dcb8bda9e17d25
parent5cd7fadc076880c48a27fd4e5e70844f127ceb99
Merge branch 'jc/checkout-m-twoway'

* jc/checkout-m-twoway:
  t/t2023-checkout-m.sh: fix use of test_must_fail