aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2011-02-22 23:42:00 +0000
committerJunio C Hamano <gitster@pobox.com>2011-03-09 23:52:55 -0800
commit2ceb61e0a030eddd46cc62e4d9a0fbf2d16faad1 (patch)
tree85ede3f1f9615e852aab649882b0e77b1f1a6dd6 /t
parentbacec4784598ca35b9be7635cbb630ef59367b6b (diff)
downloadgit-2ceb61e0a030eddd46cc62e4d9a0fbf2d16faad1.tar.gz
git-2ceb61e0a030eddd46cc62e4d9a0fbf2d16faad1.tar.xz
i18n: git-merge "Updating %s..%s" message
Gettextize the "Updating %s..%s\n" message. A test in t1200-tutorial.sh explicitly checked for this message. Split it into two tests to skip the test_cmp test under GETTEXT_POISON=YesPlease. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t1200-tutorial.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index bfa2c2190..3264fefba 100755
--- a/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.sh
@@ -163,7 +163,10 @@ test_expect_success 'git resolve' '
git checkout mybranch &&
git merge -m "Merge upstream changes." master |
sed -e "1s/[0-9a-f]\{7\}/VARIABLE/g" \
- -e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output &&
+ -e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output
+'
+
+test_expect_success C_LOCALE_OUTPUT 'git resolve output' '
test_cmp resolve.expect resolve.output
'