i18n: mark merge "Could not read from" message for translation
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>
Ævar Arnfjörð Bjarmason committed
Apr 10, 2011 at 19:34 UTC
650ed9db74188654656afcd38b1d7672161cb90b
1 file changed
+1
-1
builtin/merge.c
+1
-1
@@ -822,7 +822,7 @@ static void read_merge_msg(void)
822
{
823
strbuf_reset(&merge_msg);
824
if (strbuf_read_file(&merge_msg, git_path("MERGE_MSG"), 0) < 0)
825
- die_errno("Could not read from '%s'", git_path("MERGE_MSG"));
825
+ die_errno(_("Could not read from '%s'"), git_path("MERGE_MSG"));
826
}
827
828
static void run_prepare_commit_msg(void)