Mercurial > hg > dav / file diff

--- a/docs/src/dav-sync.1.md	Wed Apr 10 13:48:44 2019 +0200
+++ b/docs/src/dav-sync.1.md	Wed Apr 10 13:50:24 2019 +0200
@@ -33,11 +33,15 @@
     the push command (with the same conflict behavior), however it does not
     delete files on the server.
 
+list-conflicts [**-v**] *directory*
+:   Lists all conflicting files. If verbose output is enabled, the output also
+    shows the number of entries for the same conflicting file.
+
 resolve-conflicts *directory*
-:   Removes conflict entries from the database. This does not merge any files.
+:   Forcefully clears the conflict database. This does not merge any files.
     All files which are marked as conflict are normal files after running this
     command. In other words: by executing this command you assert that **you**
-    have resolved the conflicts.
+    have resolved the conflicts. Usually you will never need this command.
 
 delete-conflicts *directory*
 :   Deletes all files that are marked as a conflict. This will always delete