Merge pull request #24799 from poettering/initrd-ftw

author Luca Boccassi <bluca@debian.org>

Fri, 23 Sep 2022 19:43:15 +0000 (20:43 +0100)

committer GitHub <noreply@github.com>

Fri, 23 Sep 2022 19:43:15 +0000 (20:43 +0100)
author Luca Boccassi <bluca@debian.org>
Fri, 23 Sep 2022 19:43:15 +0000 (20:43 +0100)
committer GitHub <noreply@github.com>
Fri, 23 Sep 2022 19:43:15 +0000 (20:43 +0100)
diff --cc test/README.testsuite
Simple merge
diff --cc test/test-functions
Simple merge
author	Luca Boccassi <bluca@debian.org>
	Fri, 23 Sep 2022 19:43:15 +0000 (20:43 +0100)
committer	GitHub <noreply@github.com>
	Fri, 23 Sep 2022 19:43:15 +0000 (20:43 +0100)
		1	2
test/README.testsuite	patch \|	diff1 \|	diff2 \|	blob \| history
test/test-functions	patch \|	diff1 \|	diff2 \|	blob \| history