Mercurial > hg

comparison tests/test-manifest-merging @ 3987:c6f10448278f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-manifest-merging: we only need to remove files
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 24 Dec 2006 22:28:01 +0100
parents f921bcba405d
children 9dcf9d45cab8
comparison
equal deleted inserted replaced
3986:f921bcba405d 3987:c6f10448278f
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