summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2011-02-22 23:42:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-10 07:52:55 (GMT)
commit157efde10f34344f0970ca71f33dd5ae1c29b6f5 (patch)
tree31183c3bfe2b90c894ad265a8aadd06e0dc875cc /builtin/merge.c
parent2ce216eeda0ed3daf7dbcefe9758a5153c6f9d5a (diff)
downloadgit-157efde10f34344f0970ca71f33dd5ae1c29b6f5.zip
git-157efde10f34344f0970ca71f33dd5ae1c29b6f5.tar.gz
git-157efde10f34344f0970ca71f33dd5ae1c29b6f5.tar.bz2
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 'builtin/merge.c')
-rw-r--r--builtin/merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index 4f6b34f..f998206 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -803,7 +803,7 @@ static int merge_trivial(void)
struct commit_list *parent = xmalloc(sizeof(*parent));
write_tree_trivial(result_tree);
- printf("Wonderful.\n");
+ printf(_("Wonderful.\n"));
parent->item = lookup_commit(head);
parent->next = xmalloc(sizeof(*parent->next));
parent->next->item = remoteheads->item;