Mercurial > hg > dav / file diff

--- a/docs/man/dav-sync.1.man	Wed Apr 10 13:48:44 2019 +0200
+++ b/docs/man/dav-sync.1.man	Wed Apr 10 13:50:24 2019 +0200
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pandoc 1.16.0.2
+.\" Automatically generated by Pandoc 1.19.2.4
 .\"
 .TH "DAV\-SYNC" "1" "July 1, 2018" "Version 1.2" "DavUtils User Manuals"
 .hy
@@ -41,13 +41,21 @@
 .RS
 .RE
 .TP
+.B list\-conflicts [\f[B]\-v\f[]] \f[I]directory\f[]
+Lists all conflicting files.
+If verbose output is enabled, the output also shows the number of
+entries for the same conflicting file.
+.RS
+.RE
+.TP
 .B resolve\-conflicts \f[I]directory\f[]
-Removes conflict entries from the database.
+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 \f[B]you\f[]
 have resolved the conflicts.
+Usually you will never need this command.
 .RS
 .RE
 .TP