Merge branch 'jc/maint-checkout-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Sep 2008 05:44:45 +0000 (22:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Sep 2008 05:44:45 +0000 (22:44 -0700)
* jc/maint-checkout-fix:
checkout: do not check out unmerged higher stages randomly

Conflicts:
t/t7201-co.sh

No differences found