Merge pull request #146 from alexisgrytalms/master

author Martin Mareš <mj@ucw.cz>

Fri, 8 Dec 2023 18:41:49 +0000 (19:41 +0100)

committer GitHub <noreply@github.com>

Fri, 8 Dec 2023 18:41:49 +0000 (19:41 +0100)
author Martin Mareš <mj@ucw.cz>
Fri, 8 Dec 2023 18:41:49 +0000 (19:41 +0100)
committer GitHub <noreply@github.com>
Fri, 8 Dec 2023 18:41:49 +0000 (19:41 +0100)
diff --cc lib/header.h
Simple merge
diff --cc ls-ecaps.c
Simple merge
author	Martin Mareš <mj@ucw.cz>
	Fri, 8 Dec 2023 18:41:49 +0000 (19:41 +0100)
committer	GitHub <noreply@github.com>
	Fri, 8 Dec 2023 18:41:49 +0000 (19:41 +0100)
		1	2
lib/header.h	patch \|	diff1 \|	diff2 \|	blob \| history
ls-ecaps.c	patch \|	diff1 \|	diff2 \|	blob \| history