diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-04 22:23:49 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-04 22:23:49 +0400 |
| commit | 149a4211a4b8d8bbcdd72685d538d6ac7365e29e (patch) | |
| tree | f0e37272889876737f0216021ea8d23785763fa2 /builtin/fmt-merge-msg.c | |
| parent | bcd45b4085f9269a536c8fb1963ac8380bfac0e8 (diff) | |
| parent | eff80a9fd990de3605063050dae32f969ef18ba8 (diff) | |
Merge branch 'jc/custom-comment-char'
Allow a configuration variable core.commentchar to customize the
character used to comment out the hint lines in the edited text from
the default '#'.
* jc/custom-comment-char:
Allow custom "comment char"
Diffstat (limited to 'builtin/fmt-merge-msg.c')
| -rw-r--r-- | builtin/fmt-merge-msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index d9af43c257..b49612f0ce 100644 --- 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); } } |