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

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

mercurial