diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2021-05-02 05:14:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-03 05:14:56 (GMT) |
| commit | 80cde95eecbc3e0812a92eaa7bcd534dd256ceab (patch) | |
| tree | 37e9fc755c5c2251905fc98d552aa6702a70f271 /merge-ort-wrappers.c | |
| parent | 48bf2fa8bad054d66bd79c6ba903c89c704201f7 (diff) | |
| download | git-80cde95eecbc3e0812a92eaa7bcd534dd256ceab.zip git-80cde95eecbc3e0812a92eaa7bcd534dd256ceab.tar.gz git-80cde95eecbc3e0812a92eaa7bcd534dd256ceab.tar.bz2 | |
merge(s): apply consistent punctuation to "up to date" messages
Although the various "Already up to date" messages resulting from merge
attempts share identical phrasing, they use a mix of punctuation ranging
from "." to "!" and even "Yeeah!", which leads to extra work for
translators. Ease the job of translators by settling upon "." as
punctuation for all such messages.
While at it, take advantage of printf_ln() to further ease the
translation task so translators need not worry about line termination,
and fix a case of missing line termination in the (unused)
merge_ort_nonrecursive() function.
Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-ort-wrappers.c')
| -rw-r--r-- | merge-ort-wrappers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-ort-wrappers.c b/merge-ort-wrappers.c index 7eec25f..ad04106 100644 --- a/merge-ort-wrappers.c +++ b/merge-ort-wrappers.c @@ -30,7 +30,7 @@ int merge_ort_nonrecursive(struct merge_options *opt, return -1; if (oideq(&merge_base->object.oid, &merge->object.oid)) { - printf(_("Already up to date!")); + printf_ln(_("Already up to date.")); return 1; } |