Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
transport.c: mark more strings for translation
[gitweb.git]
/
builtin
/
fmt-merge-msg.c
diff --git
a/builtin/fmt-merge-msg.c
b/builtin/fmt-merge-msg.c
index bd680be6874da29cf776c84468a60888beea53fb..a08f239e005c58ce77ec150d4e590a339a2f809e 100644
(file)
--- a/
builtin/fmt-merge-msg.c
+++ b/
builtin/fmt-merge-msg.c
@@
-623,7
+623,7
@@
int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
i++;
p[len] = 0;
if (handle_line(p, &merge_parents))
- die
("E
rror in line %d: %.*s", i, len, p);
+ die
("e
rror in line %d: %.*s", i, len, p);
}
if (opts->add_title && srcs.nr)