Mercurial > hg > dav / file diff

--- a/test/bin-test/dav-home/sync.xml	Sun Oct 20 10:35:02 2019 +0200
+++ b/test/bin-test/dav-home/sync.xml	Sun Oct 20 11:11:22 2019 +0200
@@ -124,6 +124,8 @@
 		
 		<tagconfig>
 			<local-store format="csv">xattr</local-store>
+			<detect-changes>true</detect-changes>
+			<on-conflict>merge</on-conflict>
 		</tagconfig>
 		<metadata>all</metadata>
 	</directory>
@@ -140,6 +142,8 @@
 		
 		<tagconfig>
 			<local-store format="csv">xattr</local-store>
+			<detect-changes>true</detect-changes>
+			<on-conflict>merge</on-conflict>
 		</tagconfig>
 		<metadata>all</metadata>
 	</directory>