Merge branch 'mm/discourage-commit-a-to-finish-conflict-resolution'

diff --git a/builtin/blame.c b/builtin/blame.c
index 17d30d00aa3f6c4d0f62cae6603f9003dd2f2395..ca4ba6ff15b91d9cbb6b2ce3783fa3e69d0f3ff1 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2700,7 +2700,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
         * uninteresting.
         */
        if (prepare_revision_walk(&revs))
-               die("revision walk setup failed");
+               die(_("revision walk setup failed"));
 
        if (is_null_sha1(sb.final->object.sha1)) {
                o = sb.final->util;