Re: [PATCH/RFC] fmt-merge-msg: add a blank line after people info

[Junio C Hamano <gitster@pobox.com>]

Jonathan Nieder <jrnieder@gmail.com> writes:

> In other words, I think the objection given to the patch upthread was
> a real one, but that a more appropriate fix than using strange spacing
> would be to combine statistics from all branches being merged.

It may be real for _you_ but not for everybody.  Especially, the
current spacing is a lot more logically consistent than your Fred
the Clown example, which *does* use much more strange spacing.

I do not deeply care either way, so let's do this sometime when the
tree is calm (but not today).

 builtin/fmt-merge-msg.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index bf93b04..2c4d435 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -286,10 +286,10 @@ static void credit_people(struct strbuf *out,
 	const char *me;
 
 	if (kind == 'a') {
-		label = "\nBy ";
+		label = "\n# By ";
 		me = git_author_info(IDENT_NO_DATE);
 	} else {
-		label = "\nvia ";
+		label = "\n# Via ";
 		me = git_committer_info(IDENT_NO_DATE);
 	}