From f23101bf9f29d1404fa8ab1cdab619c335cb7f17 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 25 May 2011 12:43:59 -0700 Subject: merge: reword the final message Ever since the merge command was made multi-strategy aware, we said Merge made by octopus. at the end of a session. Reword it to Merge made by the 'octopus' strategy. Signed-off-by: Junio C Hamano --- builtin/merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin/merge.c') diff --git a/builtin/merge.c b/builtin/merge.c index 5a2a1eb797..8bc453d2f3 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -902,7 +902,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(); -- cgit v1.2.1