add more push conflict tests

add push conflict tests

add more pull conflict tests

don't print error in case rmdir fails because of ENOTEMPTY

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

mercurial