From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 20 Dec 2011 00:06:22 +0000 (-0800)
Subject: Merge branch 'jc/checkout-m-twoway'
X-Git-Tag: v1.7.9-rc0~44
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7f1068e21e5840fca0787f0925e62148b2f873ed;p=git.git

Merge branch 'jc/checkout-m-twoway'

* jc/checkout-m-twoway:
  checkout_merged(): squelch false warning from some gcc
  Test 'checkout -m -- path'
  checkout -m: no need to insist on having all 3 stages
---

7f1068e21e5840fca0787f0925e62148b2f873ed