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 -3 +3 +10 +30 +100 tip

mercurial