Merge branch 'jk/gettext-poison' into jch
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Feb 2018 20:46:35 +0000 (12:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Feb 2018 20:46:35 +0000 (12:46 -0800)
commit423a2fa6a7c66753a46034a441e0105c66f97967
treea02004a2dea1ccc1c496ab89db18005442a4c5f3
parent0a926423bdee941a6cc46dc4b9efd3b04f1fb2e4
parent373803158198310ba6ce68bfa054191038d87352
Merge branch 'jk/gettext-poison' into jch

Test updates.

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