Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-simple-update @ 466:c084cfbb2389
Add hgmerge manpage
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add hgmerge manpage
- From Vincent Danjean
manifest hash: db96fb3109a588052b21e49df81cfe65c98e72d7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCvQT2ywK+sNU5EO8RAmuFAJ0TFJ7K88OP/dMJVcFtD6Tiuon8SwCgl+W+
4NgyQCJKwgfGF6nEhqJkgck=
=Ymjz
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 24 Jun 2005 23:17:10 -0800 |
parents | b4e0e20646bb |
children | c5705ab9cebd |
rev | line source |
---|---|
331 | 1 #!/bin/bash |
2 | |
3 set -ex | |
4 | |
5 mkdir test | |
6 cd test | |
7 echo foo>foo | |
8 hg init | |
9 hg addremove | |
10 hg commit -t "1" | |
11 hg verify | |
12 cd .. | |
13 | |
14 mkdir branch | |
15 cd branch | |
16 hg init ../test | |
17 hg co | |
18 echo bar>>foo | |
19 hg commit -t "2" | |
20 | |
21 cd ../test | |
22 hg pull ../branch | |
23 hg verify | |
24 hg co | |
25 cat foo | |
26 hg manifest |