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
This commit is contained in:
Junio C Hamano
2021-05-11 15:27:22 +09:00
4 changed files with 12 additions and 8 deletions

View File

@ -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;
}