From: Junio C Hamano Date: Wed, 26 Oct 2016 20:14:46 +0000 (-0700) Subject: Merge branch 'jk/ambiguous-short-object-names' X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=caabffaf375d0f4b9195a04e9141852229ee5aee;p=git.git Merge branch 'jk/ambiguous-short-object-names' A test fixup to recently graduated topic. * jk/ambiguous-short-object-names: t1512: become resilient to GETTEXT_POISON build --- caabffaf375d0f4b9195a04e9141852229ee5aee