Kevux Git Server - rit/commit

author	René Scharfe <l.s.r@web.de>
	Sun, 26 Nov 2023 11:57:43 +0000 (12:57 +0100)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 27 Nov 2023 01:01:45 +0000 (10:01 +0900)
commit	7854bf49604484a7276b96d312b9daf7d15c7b34
tree	f43a43e0e1a3d45951af84c20e5111041ac3b24e	tree \| snapshot
parent	564d0252ca632e0264ed670534a51d18a689ef5d	commit \| diff

i18n: factorize even more 'incompatible options' messages

Continue the work of 12909b6b8a (i18n: turn "options are incompatible"
into "cannot be used together", 2022-01-05) and a699367bb8 (i18n:
factorize more 'incompatible options' messages, 2022-01-31) to use the
same parameterized error message for reporting incompatible command line
options. This reduces the number of strings to translate and makes the
UI slightly more consistent.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/clone.c		diff \| blob \| history
builtin/merge-tree.c		diff \| blob \| history
parse-options.c		diff \| blob \| history
revision.c		diff \| blob \| history
t/t0040-parse-options.sh		diff \| blob \| history
t/t1006-cat-file.sh		diff \| blob \| history
t/t4301-merge-tree-write-tree.sh		diff \| blob \| history
t/t5606-clone-options.sh		diff \| blob \| history