Mercurial > hg > dav / file diff

--- a/dav/db.h	Tue Apr 09 18:23:23 2019 +0200
+++ b/dav/db.h	Wed Apr 10 11:03:37 2019 +0200
@@ -83,6 +83,7 @@
     
     DavBool isnew;
     LocalResource *origin;
+    char *conflict_source;
 };
 
 struct FilePart {