![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 28 Dec 2011 19:44:54 +0000 (11:44 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 28 Dec 2011 19:44:54 +0000 (11:44 -0800) | ||
| commit | 9b0b0b4f45bc3d2f12391fe0dd4eaef81db97295 | |
| tree | 43c1df0a83346ce7df327f8cff1c1c2bccdbd88b | tree | snapshot |
| parent | 00754b20f931e0e85fe12e59111cf250d51d288b | commit | diff |
| parent | 5cd7fadc076880c48a27fd4e5e70844f127ceb99 | commit | diff |
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
* 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
| builtin/checkout.c | diff1 | | diff2 | | blob | history |