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

@ -628,7 +628,7 @@ int notes_merge(struct notes_merge_options *o,
if (oideq(&remote->object.oid, base_oid)) {
/* Already merged; result == local commit */
if (o->verbosity >= 2)
printf("Already up to date!\n");
printf_ln("Already up to date.");
oidcpy(result_oid, &local->object.oid);
goto found_result;
}