diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-02-22 23:42:00 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-03-09 23:52:55 -0800 |
commit | 2ceb61e0a030eddd46cc62e4d9a0fbf2d16faad1 (patch) | |
tree | 85ede3f1f9615e852aab649882b0e77b1f1a6dd6 /t/t3030-merge-recursive.sh | |
parent | i18n: git-merge basic messages (diff) | |
download | tgif-2ceb61e0a030eddd46cc62e4d9a0fbf2d16faad1.tar.xz |
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>
Diffstat (limited to 't/t3030-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions