From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 27 Apr 2012 20:58:53 +0000 (-0700)
Subject: Merge branch 'rt/cherry-revert-conflict-summary'
X-Git-Tag: v1.7.11-rc0~94
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/f5b121aef305398a3e462b28240c0d6d754315c1?hp=7a9bb265d6b0d434fc967ea2dd7a2c446370ddf7

Merge branch 'rt/cherry-revert-conflict-summary'

In the older days, the header "Conflicts:" in "cherry-pick" and
"merge" was separated by a blank line from the list of paths that
follow for readability, but when "merge" was rewritten in C, we lost
it by mistake. Remove the newline from "cherry-pick" to make them
match again.

By Ralf Thielow
* rt/cherry-revert-conflict-summary:
sequencer: remove additional blank line
---

diff --git a/sequencer.c b/sequencer.c
index 4307364b26..cd11e340dd 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)) {