From: Junio C Hamano <redacted>
Date: Fri, 19 Jul 2013 17:43:01 +0000 (-0700)
Subject: Merge branch 'jc/t1512-fix' into maint
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=069dba2a09cd9a3959194c871f475391b0960844;p=git.git

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