diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-02-22 23:42:02 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-03-09 23:52:55 -0800 |
| commit | 157efde10f34344f0970ca71f33dd5ae1c29b6f5 (patch) | |
| tree | 31183c3bfe2b90c894ad265a8aadd06e0dc875cc /t/t6037-merge-ours-theirs.sh | |
| parent | i18n: git-merge "You have not concluded your merge" messages (diff) | |
| download | tgif-157efde10f34344f0970ca71f33dd5ae1c29b6f5.tar.xz | |
i18n: 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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions