From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Dec 2011 19:44:54 +0000 (-0800)
Subject: Merge branch 'jc/checkout-m-twoway' into maint
X-Git-Tag: v1.7.8.2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9b0b0b4f45bc3d2f12391fe0dd4eaef81db97295;p=git.git

Merge branch 'jc/checkout-m-twoway' into maint

* jc/checkout-m-twoway:
  t/t2023-checkout-m.sh: fix use of test_must_fail
  checkout_merged(): squelch false warning from some gcc
  Test 'checkout -m -- path'
  checkout -m: no need to insist on having all 3 stages
---

9b0b0b4f45bc3d2f12391fe0dd4eaef81db97295