Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH] sequencer: remove additional blank line

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:53:38

Ralf Thielow [off-list ref] 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 <redacted>
---
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help