Merge pull request #1462 from DaanDeMeyer/cpio

author Jörg Behrmann <behrmann@physik.fu-berlin.de>

Wed, 19 Apr 2023 15:27:33 +0000 (17:27 +0200)

committer GitHub <noreply@github.com>

Wed, 19 Apr 2023 15:27:33 +0000 (17:27 +0200)
author Jörg Behrmann <behrmann@physik.fu-berlin.de>
Wed, 19 Apr 2023 15:27:33 +0000 (17:27 +0200)
committer GitHub <noreply@github.com>
Wed, 19 Apr 2023 15:27:33 +0000 (17:27 +0200)
diff --cc mkosi/__init__.py
Simple merge
diff --cc mkosi/config.py
Simple merge
author	Jörg Behrmann <behrmann@physik.fu-berlin.de>
	Wed, 19 Apr 2023 15:27:33 +0000 (17:27 +0200)
committer	GitHub <noreply@github.com>
	Wed, 19 Apr 2023 15:27:33 +0000 (17:27 +0200)
		1	2
mkosi/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history
mkosi/config.py	patch \|	diff1 \|	diff2 \|	blob \| history