| changeset 3988 | 9dcf9d45cab8 |
| parent 3987 | c6f10448278f |
| 3987:c6f10448278f | 3988:9dcf9d45cab8 |
|---|---|
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 -f alpha beta gamma |
33 rm alpha beta gamma |
34 hg up -C 1 |
34 hg up -C 1 |