# [PATCH] sequencer: remove additional blank line 2 messages from 2012-04-18 to 2012-04-19. Participants: Ralf Thielow, Junio C Hamano. Thread: https://gitlist.dev/t/30280 ## Ralf Thielow, 2012-04-18 21:07 Subject: [PATCH] sequencer: remove additional blank line Message-ID: <1334783245-8733-1-git-send-email-ralf.thielow@googlemail.com> URL: https://gitlist.dev/e/1334783245-8733-1-git-send-email-ralf.thielow%40googlemail.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 ``` ## Junio C Hamano, 2012-04-19 22:38 Subject: Re: [PATCH] sequencer: remove additional blank line Message-ID: URL: https://gitlist.dev/e/xmqq8vhruz3g.fsf%40junio.mtv.corp.google.com In-Reply-To: <1334783245-8733-1-git-send-email-ralf.thielow@googlemail.com> ``` Ralf Thielow writes: > 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 > ... Hrm. A funny thing is that your "Normally" is a misconception caused by a regression in 1c7b76be (Build in merge, Jul 7, 2008). Before that change, this message was "Conflicts:" followed by an empty line and it was consistently so between "merge" and "cherry-pick", but the C rewrite of "git merge" broke it. I do not care deeply either way; unifying them again to use one less line is probably fine. ```