diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-01-31 22:24:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-31 22:24:23 -0800 |
| commit | 2a2aa8e5561d4cfc00c8e021b1231958f6d4d2fa (patch) | |
| tree | 2bd05ff417fbef53a6ab56b1d8b299402dd5d87c /Documentation/git-mergetool--lib.txt | |
| parent | Merge branch 'nd/clone-detached' (diff) | |
| parent | i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXT (diff) | |
| download | tgif-2a2aa8e5561d4cfc00c8e021b1231958f6d4d2fa.tar.xz | |
Merge branch 'ar/i18n-no-gettext'
* ar/i18n-no-gettext:
i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXT
i18n: Make NO_GETTEXT imply fallthrough scheme in shell l10n
add a Makefile switch to avoid gettext translation in shell scripts
git-sh-i18n: restructure the logic to compute gettext.sh scheme
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions