tests/test-merge3
author Matt Mackall <mpm@selenic.com>
Wed, 06 Jul 2005 22:41:56 -0800
changeset 648 8c89408a7154
parent 402 2fe8d66e3075
child 749 7e4843b7efd2
permissions -rwxr-xr-x
Attempt to read all remaining remote output at close -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Attempt to read all remaining remote output at close manifest hash: e1eda33686726559849388b048a838933862fe89 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzM60ywK+sNU5EO8RAudsAJwPW/MPUBXFV13UbYmZyiwdzSr8QwCfYJqc l1ZDWPZPTN5UGUlfs0CCu7Y= =2Tat -----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