diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-05-11 06:27:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-11 06:27:22 (GMT) |
| commit | 5feebddd8683f40bc53de0f6ea0883fc13042dc3 (patch) | |
| tree | 05c26b12b3eaa517ae046bdcf460519264623722 /notes-merge.c | |
| parent | 8ca4771dd0889ce269780b5f2b48166ffaff9570 (diff) | |
| parent | ad9322da033fac2678cab90988321549e0f1c86f (diff) | |
| download | git-5feebddd8683f40bc53de0f6ea0883fc13042dc3.zip git-5feebddd8683f40bc53de0f6ea0883fc13042dc3.tar.gz git-5feebddd8683f40bc53de0f6ea0883fc13042dc3.tar.bz2 | |
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 'notes-merge.c')
| -rw-r--r-- | notes-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/notes-merge.c b/notes-merge.c index 53c587f..12e8472 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -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; } |