annotate tests/test-conflict @ 465:f8cb8d082d40
Add a doc makefile
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add a doc makefile
- From Vincent Danjean
manifest hash: ef14a37f8bdee641148e705ba13ce386cf29316a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCvQSmywK+sNU5EO8RAh/QAJoCDQVUKS8uYO5kcIqJBsrKYtj+FACgmSvI
FnYSmWjUX5kLbDHdQqM6jls=
=fPAM
-----END PGP SIGNATURE-----
| author |
mpm@selenic.com |
| date |
Fri, 24 Jun 2005 23:15:50 -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
|
