Mercurial > hg > mercurial-crew-with-dirclash
view 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 |
line wrap: on
line source
#!/bin/bash set -ex mkdir test cd test echo foo>foo hg init hg addremove hg commit -t "1" hg verify cd .. mkdir branch cd branch hg init ../test hg co echo bar>>foo hg commit -t "2" cd ../test hg pull ../branch hg verify hg co cat foo hg manifest