From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Sep 2008 05:44:45 +0000 (-0700)
Subject: Merge branch 'jc/maint-checkout-fix'
X-Git-Tag: v1.6.1-rc1~266
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/11bd3ddb913afd9665e7e822ea54be4fc8d2d5ea?hp=11bd3ddb913afd9665e7e822ea54be4fc8d2d5ea

Merge branch 'jc/maint-checkout-fix'

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

Conflicts:
t/t7201-co.sh
---