Merge pull request #5319 from keszybz/test-execute

author Lennart Poettering <lennart@poettering.net>

Mon, 13 Feb 2017 14:29:40 +0000 (15:29 +0100)

committer GitHub <noreply@github.com>

Mon, 13 Feb 2017 14:29:40 +0000 (15:29 +0100)
author Lennart Poettering <lennart@poettering.net>
Mon, 13 Feb 2017 14:29:40 +0000 (15:29 +0100)
committer GitHub <noreply@github.com>
Mon, 13 Feb 2017 14:29:40 +0000 (15:29 +0100)
diff --cc README
Simple merge
diff --cc src/test/test-execute.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Mon, 13 Feb 2017 14:29:40 +0000 (15:29 +0100)
committer	GitHub <noreply@github.com>
	Mon, 13 Feb 2017 14:29:40 +0000 (15:29 +0100)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/test-execute.c	patch \|	diff1 \|	diff2 \|	blob \| history