diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-25 12:43:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-25 13:34:17 -0700 |
| commit | f23101bf9f29d1404fa8ab1cdab619c335cb7f17 (patch) | |
| tree | 494c7c297c9f79be13ba77531ed7c668949a7415 /builtin/merge.c | |
| parent | gitweb: Refactor reading and parsing config file into read_config_file (diff) | |
| download | tgif-f23101bf9f29d1404fa8ab1cdab619c335cb7f17.tar.xz | |
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 <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |