equal
deleted
inserted
replaced
22 hg ci -d '0 0' -mtest1 |
22 hg ci -d '0 0' -mtest1 |
23 |
23 |
24 echo b >> a |
24 echo b >> a |
25 hg ci -d '1 0' -mtest2 |
25 hg ci -d '1 0' -mtest2 |
26 |
26 |
27 # should diff cloned files directly |
27 # should diff cloned files directly |
28 hg falabala -r 0:1 |
28 hg falabala -r 0:1 |
29 |
29 |
30 # test diff during merge |
30 # test diff during merge |
31 hg update 0 |
31 hg update 0 |
32 echo c >> c |
32 echo c >> c |
33 hg add c |
33 hg add c |
34 hg ci -m "new branch" -d '1 0' |
34 hg ci -m "new branch" -d '1 0' |
35 hg update -C 1 |
35 hg update -C 1 |
36 hg merge tip |
36 hg merge tip |
37 # should diff cloned file against wc file |
37 # should diff cloned file against wc file |
38 hg falabala > out || echo "diff-like tools yield a non-zero exit code" |
38 hg falabala > out || echo "diff-like tools yield a non-zero exit code" |
39 # cleanup the output since the wc is a tmp directory |
39 # cleanup the output since the wc is a tmp directory |
40 sed 's:\(.* \).*\(\/test-extdiff\):\1[tmp]\2:' out |
40 sed 's:\(.* \).*\(\/test-extdiff\):\1[tmp]\2:' out |