annotate tests/test-conflict @ 380:c72ccad3e3b8
Merge with TAH
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merge with TAH
manifest hash: 18cf61cc2b6611d74ffc490b6b733537b879d69e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsQy7ywK+sNU5EO8RAoi/AKCC0XbK73oemLr52KOQWEK4WlE9pgCgkk/8
C/m6MZJqlOKhIT4jazPwngU=
=ECGy
-----END PGP SIGNATURE-----
| author |
mpm@selenic.com |
| date |
Wed, 15 Jun 2005 21:23:07 -0800 |
| 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
|
