Merge pull request #1504 from behrmann/morematch

author Daan De Meyer <daan.j.demeyer@gmail.com>

Tue, 25 Apr 2023 11:39:57 +0000 (13:39 +0200)

committer GitHub <noreply@github.com>

Tue, 25 Apr 2023 11:39:57 +0000 (13:39 +0200)
author Daan De Meyer <daan.j.demeyer@gmail.com>
Tue, 25 Apr 2023 11:39:57 +0000 (13:39 +0200)
committer GitHub <noreply@github.com>
Tue, 25 Apr 2023 11:39:57 +0000 (13:39 +0200)
diff --cc mkosi.md
Simple merge
diff --cc mkosi/config.py
Simple merge
diff --cc tests/test_parse_load_args.py
Simple merge
author	Daan De Meyer <daan.j.demeyer@gmail.com>
	Tue, 25 Apr 2023 11:39:57 +0000 (13:39 +0200)
committer	GitHub <noreply@github.com>
	Tue, 25 Apr 2023 11:39:57 +0000 (13:39 +0200)
		1	2
mkosi.md	patch \|	diff1 \|	diff2 \|	blob \| history
mkosi/config.py	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test_parse_load_args.py	patch \|	diff1 \|	diff2 \|	blob \| history