Merge pull request #24813 from DaanDeMeyer/at-all-the-things

author Luca Boccassi <bluca@debian.org>

Thu, 10 Nov 2022 09:57:14 +0000 (10:57 +0100)

committer GitHub <noreply@github.com>

Thu, 10 Nov 2022 09:57:14 +0000 (10:57 +0100)
author Luca Boccassi <bluca@debian.org>
Thu, 10 Nov 2022 09:57:14 +0000 (10:57 +0100)
committer GitHub <noreply@github.com>
Thu, 10 Nov 2022 09:57:14 +0000 (10:57 +0100)
diff --cc src/basic/fs-util.c
Simple merge
diff --cc src/test/test-copy.c
Simple merge
author	Luca Boccassi <bluca@debian.org>
	Thu, 10 Nov 2022 09:57:14 +0000 (10:57 +0100)
committer	GitHub <noreply@github.com>
	Thu, 10 Nov 2022 09:57:14 +0000 (10:57 +0100)
		1	2
src/basic/fs-util.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/test-copy.c	patch \|	diff1 \|	diff2 \|	blob \| history