Sync with Git 2.40.1

author Junio C Hamano <gitster@pobox.com>

Tue, 25 Apr 2023 05:31:32 +0000 (22:31 -0700)

committer Junio C Hamano <gitster@pobox.com>

Tue, 25 Apr 2023 05:31:32 +0000 (22:31 -0700)
author Junio C Hamano <gitster@pobox.com>
Tue, 25 Apr 2023 05:31:32 +0000 (22:31 -0700)
committer Junio C Hamano <gitster@pobox.com>
Tue, 25 Apr 2023 05:31:32 +0000 (22:31 -0700)
diff --cc apply.c
Simple merge
diff --cc config.c
Simple merge
diff --cc gettext.c
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Tue, 25 Apr 2023 05:31:32 +0000 (22:31 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Tue, 25 Apr 2023 05:31:32 +0000 (22:31 -0700)
		1	2
apply.c	patch \|	diff1 \|	diff2 \|	blob \| history
config.c	patch \|	diff1 \|	diff2 \|	blob \| history
gettext.c	patch \|	diff1 \|	diff2 \|	blob \| history