diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-25 16:00:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-25 16:00:53 -0700 |
| commit | 284daf29026c519729747bd2051829f0f958473c (patch) | |
| tree | 5a49f8a5c137596ea4e71b28e954ff1b2564da8e /builtin/merge.c | |
| parent | b0578c9abe77f2e1c958bf76c620d59be6c2cf65 (diff) | |
| parent | f23101bf9f29d1404fa8ab1cdab619c335cb7f17 (diff) | |
| download | git-284daf29026c519729747bd2051829f0f958473c.tar.gz | |
Merge branch 'jc/merge-reword'
* jc/merge-reword:
merge: reword the final message
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 325891edb6..f32c5c6432 100644 --- 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(); |