Merge pull request #18018 from bluca/mount_images_overlay

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

Thu, 25 Feb 2021 10:31:14 +0000 (11:31 +0100)

committer GitHub <noreply@github.com>

Thu, 25 Feb 2021 10:31:14 +0000 (11:31 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 25 Feb 2021 10:31:14 +0000 (11:31 +0100)
committer GitHub <noreply@github.com>
Thu, 25 Feb 2021 10:31:14 +0000 (11:31 +0100)
diff --cc src/core/execute.c
Simple merge
diff --cc src/shared/dissect-image.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Thu, 25 Feb 2021 10:31:14 +0000 (11:31 +0100)
committer	GitHub <noreply@github.com>
	Thu, 25 Feb 2021 10:31:14 +0000 (11:31 +0100)
		1	2
src/core/execute.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/dissect-image.c	patch \|	diff1 \|	diff2 \|	blob \| history