Merge remote-tracking branch 'github/master'

author Martin Mareš <mj@ucw.cz>

Sun, 28 Dec 2025 20:09:56 +0000 (21:09 +0100)

committer Martin Mareš <mj@ucw.cz>

Sun, 28 Dec 2025 20:09:56 +0000 (21:09 +0100)
author Martin Mareš <mj@ucw.cz>
Sun, 28 Dec 2025 20:09:56 +0000 (21:09 +0100)
committer Martin Mareš <mj@ucw.cz>
Sun, 28 Dec 2025 20:09:56 +0000 (21:09 +0100)
diff --cc lib/header.h
Simple merge
diff --cc ls-ecaps.c
Simple merge
author	Martin Mareš <mj@ucw.cz>
	Sun, 28 Dec 2025 20:09:56 +0000 (21:09 +0100)
committer	Martin Mareš <mj@ucw.cz>
	Sun, 28 Dec 2025 20:09:56 +0000 (21:09 +0100)
		1	2
lib/header.h	patch \|	diff1 \|	diff2 \|	blob \| history
ls-ecaps.c	patch \|	diff1 \|	diff2 \|	blob \| history