]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
merge(s): apply consistent punctuation to "up to date" messages
authorEric Sunshine <sunshine@sunshineco.com>
Sun, 2 May 2021 05:14:22 +0000 (01:14 -0400)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 May 2021 05:14:56 +0000 (14:14 +0900)
commit80cde95eecbc3e0812a92eaa7bcd534dd256ceab
tree37e9fc755c5c2251905fc98d552aa6702a70f271
parent48bf2fa8bad054d66bd79c6ba903c89c704201f7
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>
builtin/merge.c
merge-ort-wrappers.c
merge-recursive.c
notes-merge.c