Merge pull request #23683 from keszybz/status-format

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Fri, 10 Jun 2022 12:11:53 +0000 (14:11 +0200)

committer GitHub <noreply@github.com>

Fri, 10 Jun 2022 12:11:53 +0000 (14:11 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 10 Jun 2022 12:11:53 +0000 (14:11 +0200)
committer GitHub <noreply@github.com>
Fri, 10 Jun 2022 12:11:53 +0000 (14:11 +0200)
diff --cc meson.build
Simple merge
diff --cc meson_options.txt
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Fri, 10 Jun 2022 12:11:53 +0000 (14:11 +0200)
committer	GitHub <noreply@github.com>
	Fri, 10 Jun 2022 12:11:53 +0000 (14:11 +0200)
		1	2
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
meson_options.txt	patch \|	diff1 \|	diff2 \|	blob \| history