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: http://git.tremily.us/?a=commitdiff_plain;h=f5b121aef305398a3e462b28240c0d6d754315c1;p=git.git

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
---

f5b121aef305398a3e462b28240c0d6d754315c1