Merge pull request #12218 from keszybz/use-libmount-more

author Lennart Poettering <lennart@poettering.net>

Tue, 30 Apr 2019 17:44:17 +0000 (19:44 +0200)

committer GitHub <noreply@github.com>

Tue, 30 Apr 2019 17:44:17 +0000 (19:44 +0200)
author Lennart Poettering <lennart@poettering.net>
Tue, 30 Apr 2019 17:44:17 +0000 (19:44 +0200)
committer GitHub <noreply@github.com>
Tue, 30 Apr 2019 17:44:17 +0000 (19:44 +0200)
diff --cc meson.build
Simple merge
diff --cc src/shared/mount-util.c
Simple merge
diff --cc src/shutdown/umount.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Tue, 30 Apr 2019 17:44:17 +0000 (19:44 +0200)
committer	GitHub <noreply@github.com>
	Tue, 30 Apr 2019 17:44:17 +0000 (19:44 +0200)
		1	2
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/mount-util.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/shutdown/umount.c	patch \|	diff1 \|	diff2 \|	blob \| history