diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-05-11 09:27:22 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-11 09:27:22 +0300 |
| commit | 5feebddd8683f40bc53de0f6ea0883fc13042dc3 (patch) | |
| tree | 05c26b12b3eaa517ae046bdcf460519264623722 /merge-recursive.c | |
| parent | 8ca4771dd0889ce269780b5f2b48166ffaff9570 (diff) | |
| parent | ad9322da033fac2678cab90988321549e0f1c86f (diff) | |
Merge branch 'js/merge-already-up-to-date-message-reword'
A few variants of informational message "Already up-to-date" has
been rephrased.
* js/merge-already-up-to-date-message-reword:
merge: fix swapped "up to date" message components
merge(s): apply consistent punctuation to "up to date" messages
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index b7696f3946..d146bb116f 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -3462,7 +3462,7 @@ static int merge_trees_internal(struct merge_options *opt, } if (oideq(&merge_base->object.oid, &merge->object.oid)) { - output(opt, 0, _("Already up to date!")); + output(opt, 0, _("Already up to date.")); *result = head; return 1; } |