Mercurial > hg
comparison tests/test-manifest-merging @ 3988:9dcf9d45cab8
Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Tue, 26 Dec 2006 14:17:48 +0100 |
| parents | c6f10448278f |
| children |
comparison
equal
deleted
inserted
replaced
| 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 |