i18n: mark merge "Could not read from" message for translation
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Sun, 10 Apr 2011 19:34:03 +0000 (19:34 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Apr 2011 07:12:53 +0000 (00:12 -0700)
commit650ed9db74188654656afcd38b1d7672161cb90b
tree3f235822b88e01b752473b2b19da0f499fd7249e
parentff46a49afadc92bf16ab1ec2dab6d31487de23cb
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>
builtin/merge.c