From: Junio C Hamano Date: Mon, 7 May 2012 20:13:43 +0000 (-0700) Subject: Merge branch 'rt/cherry-revert-conflict-summary' into maint X-Git-Tag: v1.7.10.2~26 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a28b919f05ed29cd9e6615179bd56edde50c6b63;p=git.git Merge branch 'rt/cherry-revert-conflict-summary' into maint 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 --- a28b919f05ed29cd9e6615179bd56edde50c6b63