![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 8 Sep 2008 05:44:45 +0000 (22:44 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 8 Sep 2008 05:44:45 +0000 (22:44 -0700) | ||
| commit | 11bd3ddb913afd9665e7e822ea54be4fc8d2d5ea | |
| tree | 1b15bd04ca47863855c045b34dd69728be98a84b | tree | snapshot |
| parent | af9ce1ffc6de9774e90a91f27fb1febd027f74f1 | commit | diff |
| parent | 8fdcf3125465f70c0cad5be5ab192d46e46307c7 | commit | diff |
Merge branch 'jc/maint-checkout-fix'
* jc/maint-checkout-fix:
checkout: do not check out unmerged higher stages randomly
Conflicts:
t/t7201-co.sh
* jc/maint-checkout-fix:
checkout: do not check out unmerged higher stages randomly
Conflicts:
t/t7201-co.sh
| builtin-checkout.c | diff1 | | diff2 | | blob | history |
| t/t7201-co.sh | diff1 | | diff2 | | blob | history |