Merge branch 'sj/userdiff-c-sharp'

[thirdparty/git.git] / fmt-merge-msg.c

diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index 66e47449a092d67b66a172a0e325593d5e494efa..ae201e21db333f89080762a9003cfa4a6f78933f 100644 (file)
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -321,7 +321,7 @@ static void credit_people(struct strbuf *out,
             skip_prefix(me, them->items->string, &me) &&
             starts_with(me, " <")))
                return;
-       strbuf_addf(out, "\n%c %s ", comment_line_char, label);
+       strbuf_addf(out, "\n%s %s ", comment_line_str, label);
        add_people_count(out, them);
 }
 
@@ -510,7 +510,7 @@ static void fmt_tag_signature(struct strbuf *tagbuf,
        if (sig->len) {
                strbuf_addch(tagbuf, '\n');
                strbuf_add_commented_lines(tagbuf, sig->buf, sig->len,
-                                          comment_line_char);
+                                          comment_line_str);
        }
 }
 
@@ -557,7 +557,7 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
                                strbuf_add_commented_lines(&tagline,
                                                origins.items[first_tag].string,
                                                strlen(origins.items[first_tag].string),
-                                               comment_line_char);
+                                               comment_line_str);
                                strbuf_insert(&tagbuf, 0, tagline.buf,
                                              tagline.len);
                                strbuf_release(&tagline);
@@ -566,7 +566,7 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
                        strbuf_add_commented_lines(&tagbuf,
                                        origins.items[i].string,
                                        strlen(origins.items[i].string),
-                                       comment_line_char);
+                                       comment_line_str);
                        fmt_tag_signature(&tagbuf, &sig, buf, len);
                }
                strbuf_release(&payload);