| changeset 3960 | c137e21dba5a |
| parent 3953 | a8eb050c6489 |
| child 3988 | 9dcf9d45cab8 |
| 3959:f321d841dce5 | 3960:c137e21dba5a |
|---|---|
28 cd foo-work |
28 cd foo-work |
29 hg pull -q |
29 hg pull -q |
30 hg merge |
30 hg merge |
31 |
31 |
32 echo % revert to changeset 1 to simulate a failed merge |
32 echo % revert to changeset 1 to simulate a failed merge |
33 rm -fr alpha beta gamma |
33 rm -f alpha beta gamma |
34 hg up -C 1 |
34 hg up -C 1 |