![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 10 Sep 2008 09:13:41 +0000 (02:13 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 10 Sep 2008 09:13:41 +0000 (02:13 -0700) |
* jc/maint-checkout-fix:
checkout: do not check out unmerged higher stages randomly
checkout: do not check out unmerged higher stages randomly
| 1 | 2 | |||
|---|---|---|---|---|
| builtin-checkout.c | patch | | diff1 | | diff2 | | blob | history |
| t/t7201-co.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin-checkout.c
Simple merge
diff --cc t/t7201-co.sh
Simple merge