Merge pull request #9199 from poettering/copy-file-atomic

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

Thu, 14 Jun 2018 09:19:22 +0000 (11:19 +0200)

committer GitHub <noreply@github.com>

Thu, 14 Jun 2018 09:19:22 +0000 (11:19 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 14 Jun 2018 09:19:22 +0000 (11:19 +0200)
committer GitHub <noreply@github.com>
Thu, 14 Jun 2018 09:19:22 +0000 (11:19 +0200)
diff --cc TODO
Simple merge
diff --cc src/basic/copy.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Thu, 14 Jun 2018 09:19:22 +0000 (11:19 +0200)
committer	GitHub <noreply@github.com>
	Thu, 14 Jun 2018 09:19:22 +0000 (11:19 +0200)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
src/basic/copy.c	patch \|	diff1 \|	diff2 \|	blob \| history