undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: mark merge "upstream" messages for translation

Browse Source 
Mark the merge messages that were added in v1.7.5-rc1~17^2 (merge:
merge with the default upstream branch without argument) by Junio C
Hamano for translation.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2011-04-10 19:34:04 +00:00 committed by Junio C Hamano
parent 650ed9db74
commit c7f426d4bc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/merge.c
View File

@ -962,16 +962,16 @@ static int setup_with_upstream(const char ***argv)
const char **args;
if (!branch)
die("No current branch.");
die(_("No current branch."));
if (!branch->remote)
die("No remote for the current branch.");
die(_("No remote for the current branch."));
if (!branch->merge_nr)
die("No default upstream defined for the current branch.");
die(_("No default upstream defined for the current branch."));
args = xcalloc(branch->merge_nr + 1, sizeof(char *));
for (i = 0; i < branch->merge_nr; i++) {
if (!branch->merge[i]->dst)
die("No remote tracking branch for %s from %s",
die(_("No remote tracking branch for %s from %s"),
branch->merge[i]->src, branch->remote_name);
args[i] = branch->merge[i]->dst;
}