diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-28 11:44:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-28 11:44:54 -0800 |
| commit | 9b0b0b4f45bc3d2f12391fe0dd4eaef81db97295 (patch) | |
| tree | 43c1df0a83346ce7df327f8cff1c1c2bccdbd88b /xdiff | |
| parent | Merge branch 'tr/doc-sh-setup' into maint (diff) | |
| parent | t/t2023-checkout-m.sh: fix use of test_must_fail (diff) | |
| download | tgif-9b0b0b4f45bc3d2f12391fe0dd4eaef81db97295.tar.xz | |
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
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions