Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
sequencer: remove additional blank line
[gitweb.git]
/
sequencer.c
diff --git
a/sequencer.c
b/sequencer.c
index a37846a594f5a2d6acfb075ece1b5c30dda2329f..f6e44b8be0eb246beaa05e023673ff8eacd6e839 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)) {