mirror of
https://github.com/git/git.git
synced 2024-10-30 22:07:53 +01:00
Merge branch 'jc/merge-reword'
* jc/merge-reword: merge: reword the final message
This commit is contained in:
commit
284daf2902
2 changed files with 4 additions and 4 deletions
|
@ -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();
|
||||
|
|
|
@ -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(-)
|
||||
|
|
Loading…
Reference in a new issue