зеркало из https://github.com/microsoft/git.git
i18n: merge-recursive: mark verbose message for translation
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
ccf7813139
Коммит
765773c839
|
@ -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)
|
||||
|
|
Загрузка…
Ссылка в новой задаче