tree 85ede3f1f9615e852aab649882b0e77b1f1a6dd6
parent bacec4784598ca35b9be7635cbb630ef59367b6b
author Ævar Arnfjörð Bjarmason <avarab@gmail.com> 1298418120 +0000
committer Junio C Hamano <gitster@pobox.com> 1299743575 -0800

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>