Merge pull request #30380 from keszybz/tmpfiles-dry-run

author Lennart Poettering <lennart@poettering.net>

Tue, 13 Feb 2024 08:45:50 +0000 (09:45 +0100)

committer GitHub <noreply@github.com>

Tue, 13 Feb 2024 08:45:50 +0000 (09:45 +0100)
author Lennart Poettering <lennart@poettering.net>
Tue, 13 Feb 2024 08:45:50 +0000 (09:45 +0100)
committer GitHub <noreply@github.com>
Tue, 13 Feb 2024 08:45:50 +0000 (09:45 +0100)
diff --cc TODO
Simple merge
diff --cc src/libsystemd/sd-journal/test-journal-interleaving.c
Simple merge
diff --cc src/shared/ptyfwd.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Tue, 13 Feb 2024 08:45:50 +0000 (09:45 +0100)
committer	GitHub <noreply@github.com>
	Tue, 13 Feb 2024 08:45:50 +0000 (09:45 +0100)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
src/libsystemd/sd-journal/test-journal-interleaving.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/ptyfwd.c	patch \|	diff1 \|	diff2 \|	blob \| history