annotate tests/test-conflict @ 385:e9e1efd5291c
Fixed problems with extra spaces around tags in .hgtags
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fixed problems with extra spaces around tags in .hgtags
manifest hash: 2a40f403d5d7d9c4d39e52fa6edefa74d5797167
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCspTvW7P1GVgWeRoRAg9PAJ9OWdUii+qO+U5ioaAbkFeIROA/7gCdGgau
ZP8jmI1h95ZK3KS/QlQMeQ4=
=lRFd
-----END PGP SIGNATURE-----
author |
Thomas Arendsen Hein <thomas@intevation.de> |
date |
Fri, 17 Jun 2005 10:16:31 +0100 |
parents |
f69a5d2d4fe1 |
children |
ee4c80d294e5 |
rev |
line source |
346
|
1 #!/bin/bash
|
|
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
|
|
14 hg -d up -m 1
|
|
15 hg id
|
|
16 cat a | grep -v ">>>" | grep -v "<<<"
|
|
17 hg status
|