Merge "checkout ambiguous ref bugfix" into maint

author Junio C Hamano <gitster@pobox.com>

Fri, 1 Apr 2011 23:16:23 +0000 (16:16 -0700)

committer Junio C Hamano <gitster@pobox.com>

Fri, 1 Apr 2011 23:16:51 +0000 (16:16 -0700)
author Junio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2011 23:16:23 +0000 (16:16 -0700)
committer Junio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2011 23:16:51 +0000 (16:16 -0700)
diff --cc builtin/checkout.c
Simple merge
diff --cc t/t2019-checkout-ambiguous-ref.sh

index 0000000000000000000000000000000000000000,943541d40d7ea331dd0ae85624a33b9f2258246c..943541d40d7ea331dd0ae85624a33b9f2258246c

mode 000000,100755..100755
--- /dev/null
--- 2/t/t2019-checkout-amiguous-ref.sh
+++ b/t/t2019-checkout-ambiguous-ref.sh
author	Junio C Hamano <gitster@pobox.com>
	Fri, 1 Apr 2011 23:16:23 +0000 (16:16 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Fri, 1 Apr 2011 23:16:51 +0000 (16:16 -0700)
		1	2
builtin/checkout.c	patch \|	diff1 \|	diff2 \|	blob \| history
t/t2019-checkout-ambiguous-ref.sh	patch \|	\|	diff2 \|	blob \| history