summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2011-02-22 23:42:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-10 07:52:55 (GMT)
commit157efde10f34344f0970ca71f33dd5ae1c29b6f5 (patch)
tree31183c3bfe2b90c894ad265a8aadd06e0dc875cc /t/t7600-merge.sh
parent2ce216eeda0ed3daf7dbcefe9758a5153c6f9d5a (diff)
downloadgit-157efde10f34344f0970ca71f33dd5ae1c29b6f5.zip
git-157efde10f34344f0970ca71f33dd5ae1c29b6f5.tar.gz
git-157efde10f34344f0970ca71f33dd5ae1c29b6f5.tar.bz2
i18n: git-merge "Wonderful" message
Gettextize the "Wonderful" message. A test in t7600-merge.sh explicitly checked for this message. Change it to skip 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/t7600-merge.sh')
-rwxr-xr-xt/t7600-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index b147a1b..87d5d78 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -495,7 +495,7 @@ test_expect_success 'merge fast-forward in a dirty tree' '
test_debug 'git log --graph --decorate --oneline --all'
-test_expect_success 'in-index merge' '
+test_expect_success C_LOCALE_OUTPUT 'in-index merge' '
git reset --hard c0 &&
git merge --no-ff -s resolve c1 >out &&
grep "Wonderful." out &&