Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Sync with v1.8.1.4
[gitweb.git]
/
builtin
/
fmt-merge-msg.c
diff --git
a/builtin/fmt-merge-msg.c
b/builtin/fmt-merge-msg.c
index d9af43c257150c957bf3bc3c3b7a7e43e370174c..b49612f0ce02e0c8503bee77477800297e84065d 100644
(file)
--- a/
builtin/fmt-merge-msg.c
+++ b/
builtin/fmt-merge-msg.c
@@
-470,7
+470,7
@@
static void fmt_tag_signature(struct strbuf *tagbuf,
strbuf_complete_line(tagbuf);
if (sig->len) {
strbuf_addch(tagbuf, '\n');
- strbuf_add_
lines(tagbuf, "# "
, sig->buf, sig->len);
+ strbuf_add_
commented_lines(tagbuf
, sig->buf, sig->len);
}
}