Code

gettextize: git-merge "Updating %s..%s" message
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Sun, 19 Sep 2010 14:43:47 +0000 (14:43 +0000)
committerÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Sat, 30 Oct 2010 07:12:07 +0000 (07:12 +0000)
commit7a1b1d33c5749522428fcb2aea3ab8c9edc6fdf9
treed4d5fee76d19929744f22afe6383789ee332e5e3
parent380a01a93b477ff08b42ec755b50152cb2251acb
gettextize: 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>
builtin/merge.c
t/t1200-tutorial.sh