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
Junio C Hamano committed
Dec 19, 2011 at 16:06 UTC
7f1068e21e5840fca0787f0925e62148b2f873ed
No changes.