From: Junio C Hamano Date: Tue, 27 Feb 2018 18:33:54 +0000 (-0800) Subject: Merge branch 'jk/gettext-poison' X-Git-Tag: v2.17.0-rc0~76 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ac0a57c0bd156738f760e2667991e66731b86b42 Merge branch 'jk/gettext-poison' Test updates. * jk/gettext-poison: git-sh-i18n: check GETTEXT_POISON before USE_GETTEXT_SCHEME t0205: drop redundant test --- ac0a57c0bd156738f760e2667991e66731b86b42