tests/test-merge3
author mpm@selenic.com
Fri, 24 Jun 2005 23:20:30 -0800
changeset 467 9d5447a366a7
parent 402 2fe8d66e3075
child 749 7e4843b7efd2
permissions -rwxr-xr-x
Add version command -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add version command Suggested by Arun Sharma manifest hash: 7fc056ffe45ee854f00e76916a560fba28c74a91 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQW+ywK+sNU5EO8RAqGQAJ91Eysw4tHVpOB7ICeN9hMF/p+lfQCgksmg TAKr5VNrw2wIZtSKjgQRqiA= =8w84 -----END PGP SIGNATURE-----

#!/bin/sh -x

hg init
echo This is file a1 > a
hg add a
hg commit -t "commit #0" -d "0 0" -u user
touch b
hg add b
rm b
hg commit -A -t"comment #1" -d "0 0" -u user