diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-19 16:06:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-19 16:06:22 -0800 |
| commit | 7f1068e21e5840fca0787f0925e62148b2f873ed (patch) | |
| tree | fc50947d7f1b4ac6816168596d0ab75c2a24ba21 /mergetools | |
| parent | Merge branch 'jk/maint-push-over-dav' (diff) | |
| parent | checkout_merged(): squelch false warning from some gcc (diff) | |
| download | tgif-7f1068e21e5840fca0787f0925e62148b2f873ed.tar.xz | |
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
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions