diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-07 22:44:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-07 22:44:45 -0700 |
| commit | 11bd3ddb913afd9665e7e822ea54be4fc8d2d5ea (patch) | |
| tree | 1b15bd04ca47863855c045b34dd69728be98a84b /combine-diff.c | |
| parent | af9ce1ffc6de9774e90a91f27fb1febd027f74f1 (diff) | |
| parent | 8fdcf3125465f70c0cad5be5ab192d46e46307c7 (diff) | |
| download | git-11bd3ddb913afd9665e7e822ea54be4fc8d2d5ea.tar.gz | |
Merge branch 'jc/maint-checkout-fix'
* jc/maint-checkout-fix:
checkout: do not check out unmerged higher stages randomly
Conflicts:
t/t7201-co.sh
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions