Merge pull request #16933 from poettering/copy-hardlinks

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

Thu, 10 Sep 2020 17:04:52 +0000 (19:04 +0200)

committer GitHub <noreply@github.com>

Thu, 10 Sep 2020 17:04:52 +0000 (19:04 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 10 Sep 2020 17:04:52 +0000 (19:04 +0200)
committer GitHub <noreply@github.com>
Thu, 10 Sep 2020 17:04:52 +0000 (19:04 +0200)
diff --cc src/partition/repart.c
Simple merge
diff --cc src/tmpfiles/tmpfiles.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Thu, 10 Sep 2020 17:04:52 +0000 (19:04 +0200)
committer	GitHub <noreply@github.com>
	Thu, 10 Sep 2020 17:04:52 +0000 (19:04 +0200)
		1	2
src/partition/repart.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/tmpfiles/tmpfiles.c	patch \|	diff1 \|	diff2 \|	blob \| history