Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge2 @ 478:f1804f2e7f35
Update of doc/hg.1.txt
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Update of doc/hg.1.txt
- - set date to release date of Mercurial 0.6
- - remove trailing spaces and other trivial changes
- - add 'hg root' and $HGEDITOR.
- - add another repository in the [paths] example
manifest hash: 873f058d10bf58c1e54381715c82c1d1aeeee1e9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCvqRXW7P1GVgWeRoRAv/NAKCeiaHsrnUFDdlMMRj1QhL4gKvi6gCgkAL4
QhH/bw/Gjs7R+9LHJW/chxs=
=G3kF
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 26 Jun 2005 13:49:27 +0100 |
parents | feadc9697b43 |
children | 7e4843b7efd2 |
line wrap: on
line source
#!/bin/sh -x mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -t "commit #0" -d "0 0" -u user echo This is file b1 > b hg add b hg commit -t "commit #1" -d "0 0" -u user rm b hg update 0 echo This is file b2 > b hg add b hg commit -t "commit #2" -d "0 0" -u user cd ..; /bin/rm -rf t mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -t "commit #0" -d "0 0" -u user echo This is file b1 > b hg add b hg commit -t "commit #1" -d "0 0" -u user rm b hg update 0 echo This is file b2 > b hg commit -A -t "commit #2" -d "0 0" -u user cd ..; /bin/rm -rf t mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -t "commit #0" -d "0 0" -u user echo This is file b1 > b hg add b hg commit -t "commit #1" -d "0 0" -u user rm b hg remove b hg update 0 echo This is file b2 > b hg commit -A -t "commit #2" -d "0 0" -u user cd ..; /bin/rm -rf t