Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Jan 2010 23:59:40 +0000 (15:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Jan 2010 23:59:40 +0000 (15:59 -0800)
commita0db3e5...78fd5fa3f54bcf7042ad3d0cb30e07f2
tree90ef8cc...887affd5aee3c1514fb39db845642b31copy hash to clipboard (tree)
parent42aac96...63a72b5bac73d34640d3a0c6233027a6copy hash to clipboard (diff)
parent6d6f9ac...5db0dfae94ef22c9ecbcf7df00f84399copy hash to clipboard (diff)
builtin-checkout.c
t/t7201-co.sh