add add-user command to help text

remove command aliases from dav help text

fix some hash based conflict resolution bugs and add tests for it

implement hash based conflict resolution in dav-sync pull

change split config

change versioning config

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

mercurial