From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Jul 2013 17:43:01 +0000 (-0700)
Subject: Merge branch 'jc/t1512-fix' into maint
X-Git-Tag: v1.8.3.4~20
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/069dba2a09cd9a3959194c871f475391b0960844

Merge branch 'jc/t1512-fix' into maint

* jc/t1512-fix:
get_short_sha1(): correctly disambiguate type-limited abbreviation
t1512: correct leftover constants from earlier edition
---

069dba2a09cd9a3959194c871f475391b0960844