]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2ce216e) | patch
i18n: git-merge "Wonderful" message
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 22 Feb 2011 23:42:02 +0000 (23:42 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2011 07:52:55 +0000 (23:52 -0800)
commit157efde10f34344f0970ca71f33dd5ae1c29b6f5
tree31183c3bfe2b90c894ad265a8aadd06e0dc875cctree | snapshot
parent2ce216eeda0ed3daf7dbcefe9758a5153c6f9d5acommit | diff
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>
builtin/merge.c diff | blob | blame | history
t/t7600-merge.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.