From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 Aug 2010 01:32:49 +0000 (-0700)
Subject: Merge branch 'jc/sha1-name-find-fix'
X-Git-Tag: v1.7.3-rc0~83
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3d045897585c4b1ca0dce6bb5a33331f1b48c2bf?ds=sidebyside;hp=3d045897585c4b1ca0dce6bb5a33331f1b48c2bf

Merge branch 'jc/sha1-name-find-fix'

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

Conflicts:
sha1_name.c
---