From: Junio C Hamano <jch@google.com>
Date: Thu, 19 Apr 2012 22:38:11 GMT
Subject: Re: [PATCH] sequencer: remove additional blank line
Message-ID: <xmqq8vhruz3g.fsf@junio.mtv.corp.google.com>
In-Reply-To: <1334783245-8733-1-git-send-email-ralf.thielow@googlemail.com>

Ralf Thielow <ralf.thielow@googlemail.com> 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 <ralf.thielow@googlemail.com>
> ---
> 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.