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

rename conflict test script

add pull conflict detection tests

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

mercurial