diff options
| author | Vasco Almeida <vascomalmeida@sapo.pt> | 2016-09-15 14:59:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-15 20:17:32 (GMT) |
| commit | 765773c8397800218e7389fd3e9431cfbfdb6ad1 (patch) | |
| tree | fe3d26ff90a95eb927d514acb56b31c43370eb65 /builtin/merge-recursive.c | |
| parent | ccf7813139f0cb8800b0490d572a22c864a2f0f6 (diff) | |
| download | git-765773c8397800218e7389fd3e9431cfbfdb6ad1.zip git-765773c8397800218e7389fd3e9431cfbfdb6ad1.tar.gz git-765773c8397800218e7389fd3e9431cfbfdb6ad1.tar.bz2 | |
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>
Diffstat (limited to 'builtin/merge-recursive.c')
| -rw-r--r-- | builtin/merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c index 3b09610..0dd9021 100644 --- 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) |