Merge branch 'rs/commit-list-append'

diff --git a/sequencer.c b/sequencer.c
index ac6c8238e51f82d186ddfefc952cb8f03d9a2eaf..81d8ace35fa51f029cf78a4710a5668277a95af6 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)) {