Merge branch 'jc/maint-checkout-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Sep 2008 09:13:41 +0000 (02:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Sep 2008 09:13:41 +0000 (02:13 -0700)
commit94c27881bd98d5bb70e3d4f8a18e384095c876b9
treeafb52cefd82080596aa910bb3e84b75e1d10ee9a
parent9f35e5fd544ab87488b12d9b97be983303e58bd2
parent8fdcf3125465f70c0cad5be5ab192d46e46307c7
Merge branch 'jc/maint-checkout-fix' into maint

* jc/maint-checkout-fix:
  checkout: do not check out unmerged higher stages randomly
builtin-checkout.c
t/t7201-co.sh