Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
.mailmap: map different names with the same email address together
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index 8e44d7e5f3d72ee71580dc98d5e7d13c4d56779f..5814d056ff9fdfad6de5a748806cf307b1e5d388 100644
(file)
--- 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_add
ch(&o->obuf, '\n'
);
if (!o->buffer_output)
flush_output(o);
}