Merge branch 'rt/cherry-revert-conflict-summary' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 May 2012 20:13:43 +0000 (13:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 May 2012 20:13:43 +0000 (13:13 -0700)
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

1  2 
sequencer.c

diff --cc sequencer.c
Simple merge