From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 22 Mar 2018 21:24:18 +0000 (-0700)
Subject: Merge branch 'jk/gettext-poison' into maint
X-Git-Tag: v2.16.3~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e1062d30fe963fd3313ee32aef2291195194f06;p=thirdparty%2Fgit.git

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
---

2e1062d30fe963fd3313ee32aef2291195194f06