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

diff --combined sequencer.c
index 4307364b261bcbe7a2e97116aa631aa7aa35613c,f6e44b8be0eb246beaa05e023673ff8eacd6e839..cd11e340dda2d3905df84d9187f70226affef08f
--- 1/sequencer.c
--- 2/sequencer.c
+++ b/sequencer.c
@@@ -164,7 -164,7 +164,7 @@@ static void write_message(struct strbu
  
  static struct tree *empty_tree(void)
  {
 -      return lookup_tree((const unsigned char *)EMPTY_TREE_SHA1_BIN);
 +      return lookup_tree(EMPTY_TREE_SHA1_BIN);
  }
  
  static int error_dirty_index(struct replay_opts *opts)
@@@ -234,7 -234,7 +234,7 @@@ static int do_recursive_merge(struct co
  
        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)) {