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>
Vasco Almeida committed
Sep 15, 2016 at 14:59 UTC
765773c8397800218e7389fd3e9431cfbfdb6ad1
1 file changed
+1
-1
builtin/merge-recursive.c
+1
-1
@@ -74,7 +74,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
74
o.branch2 = better_branch_name(o.branch2);
75
76
if (o.verbosity >= 3)
77
- printf("Merging %s with %s\n", o.branch1, o.branch2);
77
+ printf(_("Merging %s with %s\n"), o.branch1, o.branch2);
78
79
failed = merge_recursive_generic(&o, &h1, &h2, bases_count, bases, &result);
80
if (failed < 0)