summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Jiang Xin <worldhello.net@gmail.com>2012-08-27 13:36:51 +0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-08-27 09:26:30 -0700
commitb354f11b595bb2bca4bae96b06778b3a9882b621 (patch)
tree9a33b85a13ca2def31bac3cf373d67c659d6af93 /git-merge-octopus.sh
parentFix tests under GETTEXT_POISON on git-stash (diff)
downloadtgif-b354f11b595bb2bca4bae96b06778b3a9882b621.tar.xz
Fix tests under GETTEXT_POISON on diffstat
Use the i18n-specific test functions in test scripts for diffstat. This issue was was introduced in v1.7.9-1-g7f814: 7f814 Use correct grammar in diffstat summary line and been broken under GETTEXT_POISON=YesPlease since. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> 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 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions