diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-26 03:00:53 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-26 03:00:53 +0400 |
| commit | 284daf29026c519729747bd2051829f0f958473c (patch) | |
| tree | 5a49f8a5c137596ea4e71b28e954ff1b2564da8e | |
| parent | b0578c9abe77f2e1c958bf76c620d59be6c2cf65 (diff) | |
| parent | f23101bf9f29d1404fa8ab1cdab619c335cb7f17 (diff) | |
Merge branch 'jc/merge-reword'
* jc/merge-reword:
merge: reword the final message
| -rw-r--r-- | builtin/merge.c | 2 | ||||
| -rwxr-xr-x | t/t7602-merge-octopus-many.sh | 6 |
2 files changed, 4 insertions, 4 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(); diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh index 0a46795ae7..61f36baa1f 100755 --- a/t/t7602-merge-octopus-many.sh +++ b/t/t7602-merge-octopus-many.sh @@ -53,7 +53,7 @@ cat >expected <<\EOF Trying simple merge with c2 Trying simple merge with c3 Trying simple merge with c4 -Merge made by octopus. +Merge made by the 'octopus' strategy. c2.c | 1 + c3.c | 1 + c4.c | 1 + @@ -72,7 +72,7 @@ test_expect_success 'merge output uses pretty names' ' cat >expected <<\EOF Already up-to-date with c4 Trying simple merge with c5 -Merge made by octopus. +Merge made by the 'octopus' strategy. c5.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 c5.c @@ -86,7 +86,7 @@ test_expect_success 'merge up-to-date output uses pretty names' ' cat >expected <<\EOF Fast-forwarding to: c1 Trying simple merge with c2 -Merge made by octopus. +Merge made by the 'octopus' strategy. c1.c | 1 + c2.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) |