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

use hash to check if a file content was really modified

handle symlinks according to config

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

mercurial