Merge branch 'jc/sha1-name-find-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Aug 2010 01:32:49 +0000 (18:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Aug 2010 01:32:49 +0000 (18:32 -0700)
* jc/sha1-name-find-fix:
sha1_name.c: fix parsing of ":/token" syntax

Conflicts:
sha1_name.c

No differences found