summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2012-09-13 21:16:26 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-14 09:52:16 -0700
commit218adaaaa064c436115dbcd5705a0e2c42e90a25 (patch)
treeb3c4c11e89aada5d108a10e43d00e243e1ff30c6 /Documentation/technical/trivial-merge.txt
parentGit 1.7.12 (diff)
downloadtgif-218adaaaa064c436115dbcd5705a0e2c42e90a25.tar.xz
Revert diffstat back to English
This reverts the i18n part of 7f81463 (Use correct grammar in diffstat summary line - 2012-02-01) but still keeps the grammar correctness for English. It also reverts b354f11 (Fix tests under GETTEXT_POISON on diffstat - 2012-08-27). The result is diffstat always in English for all commands. This helps stop users from accidentally sending localized format-patch'd patches. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions