Commit 70a0c8ec6e6b62f44cf81a937107e64429ee5572

Stefan Sperling 2019-02-20T10:35:33

preserve permissions on merged files