| changeset 3328 | 49966b5ab16f |
| parent 2976 | 61fcd9fac434 |
| child 3751 | 797c6e70092b |
| 3299:a1aad25ccc3e | 3328:49966b5ab16f |
|---|---|
24 hg ci -d '0 0' -mtest1 |
24 hg ci -d '0 0' -mtest1 |
25 |
25 |
26 echo b >> a |
26 echo b >> a |
27 hg ci -d '1 0' -mtest2 |
27 hg ci -d '1 0' -mtest2 |
28 |
28 |
29 hg falabala -r 0:1 || echo "diff-like tools yield a non-zero exit code" |
29 hg falabala -r 0:1 |
30 |
|
31 # test diff during merge |
|
32 hg update 0 |
|
33 echo b >> b |
|
34 hg add b |
|
35 hg ci -m "new branch" -d '1 0' |
|
36 hg update -C 1 |
|
37 hg merge tip |
|
38 hg falabala || echo "diff-like tools yield a non-zero exit code" |