Merge branch 'ab/test-must-be-empty'

diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index ca9206fbbe1c2d9da706111a8de31396b3bf5909..f35ff1612bb563c819b611e82f8e3a7730d32461 100644 (file)
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -628,7 +628,7 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
                i++;
                p[len] = 0;
                if (handle_line(p, &merge_parents))
-                       die ("Error in line %d: %.*s", i, len, p);
+                       die("error in line %d: %.*s", i, len, p);
        }
 
        if (opts->add_title && srcs.nr)