Merge branch 'jc/sha1-name-find-fix'
commit3d045897585c4b1ca0dce6bb5a33331f1b48c2bf
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Aug 2010 01:32:49 +0000 (12 18:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Aug 2010 01:32:49 +0000 (12 18:32 -0700)
tree34e52c7654827bf06d83b6e04c16fa3e5e2b0c53
parentba6ca757bb1859e924fe65cc9f04fe0551225c6d
parentf7bff00314f473be1ef6c166e91447fabd1822d8
Merge branch 'jc/sha1-name-find-fix'

* jc/sha1-name-find-fix:
  sha1_name.c: fix parsing of ":/token" syntax

Conflicts:
sha1_name.c
sha1_name.c