| changeset 2186 | 1092533fd11c |
| parent 2158 | ec96c4518236 |
| child 2492 | 2f4addf56715 |
| 2184:2477a7183a6f | 2186:1092533fd11c |
|---|---|
26 cat a |
26 cat a |
27 |
27 |
28 echo '# backout of backout is as if nothing happened' |
28 echo '# backout of backout is as if nothing happened' |
29 |
29 |
30 hg backout -d '3 0' --merge tip |
30 hg backout -d '3 0' --merge tip |
31 cat a |
31 cat a 2>/dev/null || echo cat: a: No such file or directory |
32 |
32 |
33 echo '# backout with merge' |
33 echo '# backout with merge' |
34 cd .. |
34 cd .. |
35 hg init merge |
35 hg init merge |
36 cd merge |
36 cd merge |