Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-conflict @ 595:c2c2c6d617bd
Expand undo docs
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Expand undo docs
manifest hash: 4381a35ef96ce10176dde3c9c6c2503f65ae8a09
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyD93ywK+sNU5EO8RAianAJ97+hYOTwV3OvAAekcYn3f1Ahzf4ACeLjgz
kUAHrjSmhs2F421lXxbgCfw=
=gbg9
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sun, 03 Jul 2005 11:41:43 -0800 |
parents | eb46971fc57f |
children | 7e4843b7efd2 |
rev | line source |
---|---|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
392
diff
changeset
|
1 #!/bin/sh |
346 | 2 |
3 set -x | |
4 hg init | |
5 echo "nothing" > a | |
6 hg add a | |
7 hg commit -t ancestor -u test -d "0 0" | |
8 echo "something" > a | |
9 hg commit -t branch1 -u test -d "0 0" | |
10 hg co 0 | |
11 echo "something else" > a | |
12 hg commit -t branch2 -u test -d "0 0" | |
13 export HGMERGE=merge | |
591 | 14 hg up -m 1 |
346 | 15 hg id |
392 | 16 grep -Ev ">>>|<<<" a |
346 | 17 hg status |