Merge branch 'sx/pthread-error-check-fix'

author Junio C Hamano <gitster@pobox.com>

Mon, 19 Dec 2022 02:46:17 +0000 (11:46 +0900)

committer Junio C Hamano <gitster@pobox.com>

Mon, 19 Dec 2022 02:46:17 +0000 (11:46 +0900)
author Junio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2022 02:46:17 +0000 (11:46 +0900)
committer Junio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2022 02:46:17 +0000 (11:46 +0900)
diff --cc builtin/fsmonitor--daemon.c
Simple merge
diff --cc run-command.c
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Mon, 19 Dec 2022 02:46:17 +0000 (11:46 +0900)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 19 Dec 2022 02:46:17 +0000 (11:46 +0900)
		1	2
builtin/fsmonitor--daemon.c	patch \|	diff1 \|	diff2 \|	blob \| history
run-command.c	patch \|	diff1 \|	diff2 \|	blob \| history