![[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) |
* 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
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
| 1 | 2 | |||
|---|---|---|---|---|
| builtin/checkout.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin/checkout.c
Simple merge