diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-16 22:33:09 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-16 22:33:09 +0400 |
| commit | 1fc83452c76e65385b3da69ea94eb957e36e6c78 (patch) | |
| tree | 6d6105b9a9fed643036df3d0fceabde1ab1479c7 /merge-recursive.c | |
| parent | f357797678aa5ae35c63623b8b76eb682d5b9b79 (diff) | |
| parent | 9d02150cf4d833935161ef265e4dc03807caa800 (diff) | |
Merge branch 'rs/code-cleaning'
* rs/code-cleaning:
fsck: simplify fsck_commit_buffer() by using commit_list_count()
commit: use commit_list_append() instead of duplicating its code
merge: simplify merge_trivial() by using commit_list_append()
use strbuf_addch for adding single characters
use strbuf_addbuf for adding strbufs
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 8e44d7e5f3..5814d056ff 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -171,7 +171,7 @@ static void output(struct merge_options *o, int v, const char *fmt, ...) strbuf_vaddf(&o->obuf, fmt, ap); va_end(ap); - strbuf_add(&o->obuf, "\n", 1); + strbuf_addch(&o->obuf, '\n'); if (!o->buffer_output) flush_output(o); } |