[PATCH 11/25] gettextize: git-merge "In-index merge" message
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Sep 2, 2010, 19:40 UTC
- Message-ID
- <1283456446-22577-12-git-send-email-avarab@gmail.com>
- In-Reply-To
- <1283373845-2022-1-git-send-email-avarab@gmail.com>
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 <avarab@gmail.com> --- 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