Merge branch 'jc/merge-reword'

* jc/merge-reword:
merge: reword the final message

diff --combined builtin/merge.c
index 325891edb610945d01899b102993202af279bf3f,8bc453d2f30a72bf664696a20ccf55f3970275c9..f32c5c64328086cadb424977f170bfb0c70acbed
--- 1/builtin/merge.c
--- 2/builtin/merge.c
+++ b/builtin/merge.c
@@@ -339,14 -339,13 +339,14 @@@ static void squash_message(void
  
        ctx.abbrev = rev.abbrev;
        ctx.date_mode = rev.date_mode;
 +      ctx.fmt = rev.commit_format;
  
        strbuf_addstr(&out, "Squashed commit of the following:\n");
        while ((commit = get_revision(&rev)) != NULL) {
                strbuf_addch(&out, '\n');
                strbuf_addf(&out, "commit %s\n",
                        sha1_to_hex(commit->object.sha1));
 -              pretty_print_commit(rev.commit_format, commit, &out, &ctx);
 +              pretty_print_commit(&ctx, commit, &out);
        }
        if (write(fd, out.buf, out.len) < 0)
                die_errno(_("Writing SQUASH_MSG"));
@@@ -903,7 -902,7 +903,7 @@@ static int finish_automerge(struct comm
        strbuf_addch(&merge_msg, '\n');
        run_prepare_commit_msg();
        commit_tree(merge_msg.buf, result_tree, parents, result_commit, NULL);
-       strbuf_addf(&buf, "Merge made by %s.", wt_strategy);
+       strbuf_addf(&buf, "Merge made by the '%s' strategy.", wt_strategy);
        finish(result_commit, buf.buf);
        strbuf_release(&buf);
        drop_save();