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

implement hash based conflict resolution in dav-sync pull

change split config

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

mercurial