mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-28 17:22:20 +02:00
Code

i18n: merge-recursive: mark verbose message for translation

Browse Source 
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Vasco Almeida 2016-09-15 14:59:02 +00:00 committed by Junio C Hamano
parent ccf7813139
commit 765773c839
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/merge-recursive.c
View File

@ -74,7 +74,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
o.branch2 = better_branch_name(o.branch2);
if (o.verbosity >= 3)
printf("Merging %s with %s\n", o.branch1, o.branch2);
printf(_("Merging %s with %s\n"), o.branch1, o.branch2);
failed = merge_recursive_generic(&o, &h1, &h2, bases_count, bases, &result);
if (failed < 0)