added resolve-conflicts and delete-conflicts commands

dav-sync push ignores conflict files

dav-sync add-directory shows list of repositories

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

mercurial