Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
remote-curl: hoist gzip buffer size to top of post_rpc
[gitweb.git]
/
sequencer.c
diff --git
a/sequencer.c
b/sequencer.c
index 4307364b261bcbe7a2e97116aa631aa7aa35613c..cd11e340dda2d3905df84d9187f70226affef08f 100644
(file)
--- a/
sequencer.c
+++ b/
sequencer.c
@@
-234,7
+234,7
@@
static int do_recursive_merge(struct commit *base, struct commit *next,
if (!clean) {
int i;
- strbuf_addstr(msgbuf, "\nConflicts:\n
\n
");
+ strbuf_addstr(msgbuf, "\nConflicts:\n");
for (i = 0; i < active_nr;) {
struct cache_entry *ce = active_cache[i++];
if (ce_stage(ce)) {