Merge branch 'jc/merge-reword'

* jc/merge-reword: merge: reword the final message
2011-08-25 16:00:53 -07:00
parent b0578c9abe f23101bf9f
commit 284daf2902
2 changed files with 4 additions and 4 deletions
--- a/builtin/merge.c
+++ b/builtin/merge.c
@ -903,7 +903,7 @@ static int finish_automerge(struct commit_list *common,
 	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();