diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-19 16:24:39 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-19 16:24:39 +0900 |
| commit | 954932667dac15885165cdb579acbf6a774fe140 (patch) | |
| tree | 73d9e230929da6c9ffcb17ac6a52516a7ff32e3f /builtin/merge.c | |
| parent | RelNotes: name the release properly (diff) | |
| parent | Makefile: ease dynamic-gettext-poison transition (diff) | |
| download | tgif-954932667dac15885165cdb579acbf6a774fe140.tar.xz | |
Merge branch 'ab/dynamic-gettext-poison'
Our testing framework uses a special i18n "poisoned localization"
feature to find messages that ought to stay constant but are
incorrectly marked to be translated. This feature has been made
into a runtime option (it used to be a compile-time option).
* ab/dynamic-gettext-poison:
Makefile: ease dynamic-gettext-poison transition
i18n: make GETTEXT_POISON a runtime option
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions