diff -r 3ae1410b9d13 -r a6b1ec1b7ba0 test/bin-test/test-dav-sync-pull-conflict.sh
--- a/test/bin-test/test-dav-sync-pull-conflict.sh	Sun Aug 25 11:42:55 2019 +0200
+++ b/test/bin-test/test-dav-sync-pull-conflict.sh	Thu Aug 29 20:49:05 2019 +0200
@@ -90,6 +90,12 @@
 $DAV_BIN mkcol dav-test-repo/sync/test1 2> /dev/null
 $DAV_BIN mkcol dav-test-repo/sync/test2 2> /dev/null
 
+# tmp sync dir
+rm -Rf tmp-sync
+mkdir tmp-sync
+mkdir tmp-sync/test1a
+mkdir tmp-sync/test1b
+
 # prepare
 cp synctest/file1 tmp-sync/test1a
 cp synctest/file2 tmp-sync/test1a