Merge pull request #16282 from poettering/repart-copy-blocks

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

Tue, 30 Jun 2020 13:26:06 +0000 (15:26 +0200)

committer GitHub <noreply@github.com>

Tue, 30 Jun 2020 13:26:06 +0000 (15:26 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 30 Jun 2020 13:26:06 +0000 (15:26 +0200)
committer GitHub <noreply@github.com>
Tue, 30 Jun 2020 13:26:06 +0000 (15:26 +0200)
diff --cc TODO
Simple merge
diff --cc src/partition/test-repart.sh
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Tue, 30 Jun 2020 13:26:06 +0000 (15:26 +0200)
committer	GitHub <noreply@github.com>
	Tue, 30 Jun 2020 13:26:06 +0000 (15:26 +0200)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
src/partition/test-repart.sh	patch \|	diff1 \|	diff2 \|	blob \| history