annotate tests/test-conflict @ 446:8cc0ee3f18fb
The beginnings of a FAQ file
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
The beginnings of a FAQ file
manifest hash: 234ee7d9fb5cd3b0bd794e615a74f96a4cc234e0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuy48ywK+sNU5EO8RAmdYAJ923bFC/a6q28nVYumWsaQ+axlKawCfS7IC
kh1xVlj5OYOloicyaHDhLU4=
=7CJ2
-----END PGP SIGNATURE-----
| author |
mpm@selenic.com |
| date |
Thu, 23 Jun 2005 13:48:44 -0800 |
| parents |
ee4c80d294e5 |
| children |
3d4d5f2aba9a 4fc63e22b1fe |
| 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
|
|
392
|
16 grep -Ev ">>>|<<<" a
|
|
346
|
17 hg status
|
