increase snyc_conflict counter only after conflict renaming, to make sure the counter is correct when pull is aborted

fix dav-sync push not deleting files

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

mercurial