My Various Git Projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ccf7813
)
i18n: merge-recursive: mark verbose message for translation
author
Vasco Almeida
<vascomalmeida@sapo.pt>
Thu, 15 Sep 2016 14:59:02 +0000
(14:59 +0000)
committer
Junio 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
patch
|
blob
|
history
diff --git
a/builtin/merge-recursive.c
b/builtin/merge-recursive.c
index
3b09610
..
0dd9021
100644
(file)
--- a/
builtin/merge-recursive.c
+++ b/
builtin/merge-recursive.c
@@
-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)