Code

Merge branch 'jc/checkout-m-twoway'
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 21:24:08 +0000 (13:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 21:24:08 +0000 (13:24 -0800)
* jc/checkout-m-twoway:
  t/t2023-checkout-m.sh: fix use of test_must_fail


Trivial merge