Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 8 Jun 2007 09:55:19 +0000 (02:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 8 Jun 2007 09:55:19 +0000 (02:55 -0700)
* maint:
  checkout: do not get confused with ambiguous tag/branch names

1  2 
git-checkout.sh

diff --cc git-checkout.sh
Simple merge