Merge branch 'jk/gettext-poison' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Feb 2018 21:34:29 +0000 (13:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Feb 2018 21:34:29 +0000 (13:34 -0800)
Test updates.

* jk/gettext-poison:
git-sh-i18n: check GETTEXT_POISON before USE_GETTEXT_SCHEME
t0205: drop redundant test

Trivial merge