Code

i18n: git-merge "Updating %s..%s" message
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 22 Feb 2011 23:42:00 +0000 (23:42 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2011 07:52:55 +0000 (23:52 -0800)
commit2ceb61e0a030eddd46cc62e4d9a0fbf2d16faad1
tree85ede3f1f9615e852aab649882b0e77b1f1a6dd6
parentbacec4784598ca35b9be7635cbb630ef59367b6b
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>
builtin/merge.c
t/t1200-tutorial.sh