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)
commit11bd3ddb913afd9665e7e822ea54be4fc8d2d5ea
tree1b15bd04ca47863855c045b34dd69728be98a84b
parentaf9ce1ffc6de9774e90a91f27fb1febd027f74f1
parent8fdcf3125465f70c0cad5be5ab192d46e46307c7
Merge branch 'jc/maint-checkout-fix'

* jc/maint-checkout-fix:
  checkout: do not check out unmerged higher stages randomly

Conflicts:
t/t7201-co.sh
builtin-checkout.c
t/t7201-co.sh