i18n: merge-recursive: mark verbose message for translation
authorVasco Almeida <vascomalmeida@sapo.pt>
Thu, 15 Sep 2016 14:59:02 +0000 (14:59 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Sep 2016 20:17:32 +0000 (13:17 -0700)
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge-recursive.c
index 3b0961006385dd9b011d9795ba8b9db7d4afe7f0..0dd902195878aedef76559ad67ad6dc9384141b3 100644 (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)