rename conflict test script

add pull conflict detection tests

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

mercurial