mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: mark merge "Could not read from" message for translation

Browse Source 
Mark the "Could not read from '%s'" message that was added to
builtin/merge.c in v1.7.4.2~25^2 (merge: honor prepare-commit-msg
hook) by Jay Soffian 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:03 +00:00
committed by Junio C Hamano
parent ff46a49afa
commit 650ed9db74
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/merge.c
View File

@ -822,7 +822,7 @@ static void read_merge_msg(void)
{ {
strbuf_reset(&merge_msg); strbuf_reset(&merge_msg);
if (strbuf_read_file(&merge_msg, git_path("MERGE_MSG"), 0) < 0) if (strbuf_read_file(&merge_msg, git_path("MERGE_MSG"), 0) < 0)
die_errno("Could not read from '%s'", git_path("MERGE_MSG")); die_errno(_("Could not read from '%s'"), git_path("MERGE_MSG"));
} }
static void run_prepare_commit_msg(void) static void run_prepare_commit_msg(void)