Merge branch 'jk/gettext-poison' into maint
commit2e1062d30fe963fd3313ee32aef2291195194f06
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Mar 2018 21:24:18 +0000 (22 14:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Mar 2018 21:24:19 +0000 (22 14:24 -0700)
treebe14aae5333dd2b9c794b8c966388f222e3f0576
parent34f6f0eca294294f5a5bae3a85bca9d97782457e
parent373803158198310ba6ce68bfa054191038d87352
Merge branch 'jk/gettext-poison' into maint

Test updates.

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