[PATCH 11/25] gettextize: git-merge "In-index merge" message
From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2016-06-15 22:49:28
Subsystem:
the rest · Maintainer:
Linus Torvalds
Make the "In-index merge" message translatable. This just emits to stdout via finish(), so translating it should be fine. Signed-off-by: Ævar Arnfjörð Bjarmason <redacted> --- builtin/merge.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index bf3b313..956ce14 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c@@ -791,7 +791,7 @@ static int merge_trivial(void) parent->next->item = remoteheads->item; parent->next->next = NULL; commit_tree(merge_msg.buf, result_tree, parent, result_commit, NULL); - finish(result_commit, "In-index merge"); + finish(result_commit, _("In-index merge")); drop_save(); return 0; }
--
1.7.2.2.614.g1dc9