added resolve-conflicts and delete-conflicts to help text and fixed crash with unknown cmd options

automatically remove deleted conflict files from the db

added resolve-conflicts and delete-conflicts commands

dav-sync push ignores conflict files

dav-sync add-directory shows list of repositories

fixed version output

added options for extended list flags and changed version output

added noinput option to dav

dav list indicates locks

added lock support to some dav commands

(0) -100 -10 +10 +100 +300 tip

mercurial