From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 20 Dec 2011 21:24:08 +0000 (-0800)
Subject: Merge branch 'jc/checkout-m-twoway'
X-Git-Tag: v1.7.9-rc0~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b048b197d6c183b69ad0914da127321c1e6b6a6;p=thirdparty%2Fgit.git

Merge branch 'jc/checkout-m-twoway'

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

1b048b197d6c183b69ad0914da127321c1e6b6a6