From: Ralf Thielow Date: Wed, 18 Apr 2012 21:07:25 GMT Subject: [PATCH] sequencer: remove additional blank line Message-ID: <1334783245-8733-1-git-send-email-ralf.thielow@googlemail.com> Remove an additional blank line between the headline and the list of conflicted files after doing a recursive merge. Signed-off-by: Ralf Thielow --- Normally, the list of conflicted files come directly after the headline like this Conflicts: folder/file ... Without this patch it would looks like this: Conflicts: folder/file ... sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index a37846a..f6e44b8 100644 --- 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)) { -- 1.7.10.170.gac579