add pull conflict detection tests

use hash to check if a file content was really modified

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

mercurial