tests/test-merge3
author Thomas Arendsen Hein <thomas@intevation.de>
Sun, 26 Jun 2005 13:25:07 +0100
changeset 477 520540fd6b64
parent 402 2fe8d66e3075
child 749 7e4843b7efd2
permissions -rwxr-xr-x
Handle errors in .hgtags or hgrc [tags] section more gracefully. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Handle errors in .hgtags or hgrc [tags] section more gracefully. manifest hash: 85c62e1bf3ad78b243ee60f43c3c577700a8c96d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvp6jW7P1GVgWeRoRAo23AKCZRU22IweynNtf9k3q4pEyqEaozACeMIRV 6tNOkr3h6jTiMZ2bJgPeabg= =+U5s -----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