Code

gettextize: git-merge "Wonderful" message
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Sun, 19 Sep 2010 14:18:47 +0000 (14:18 +0000)
committerÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Sat, 30 Oct 2010 07:12:08 +0000 (07:12 +0000)
commit9f3027d81b734a38d285e814d0c86f272184fc73
tree3e2b6438e7a19763f17f7aae756ecf26f08ccf84
parent5cd3549c58c1981fa87a04bd955b60bef7247b1e
gettextize: 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>
builtin/merge.c
t/t7600-merge.sh