Mercurial > hg > dav / file diff

--- a/dav/sync.c	Sat Nov 23 15:14:50 2019 +0100
+++ b/dav/sync.c	Sat Nov 23 17:49:18 2019 +0100
@@ -1040,7 +1040,7 @@
             ret = type;
         }
     } else if(link) {
-        if(type == REMOTE_CHANGE_CONFLICT_LOCAL_MODIFIED) {
+        if(exists && type == REMOTE_CHANGE_CONFLICT_LOCAL_MODIFIED) {
             ret = REMOTE_CHANGE_CONFLICT_LOCAL_MODIFIED;
         } else {
             ret = REMOTE_CHANGE_LINK;