view tests/test-merge3 @ 701:80ed193efff7

On importing the result of 'hg export', parse while reading and drop headers. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On importing the result of 'hg export', parse while reading and drop headers. manifest hash: 385cb4205bb6e4291a412d740400de44bd2e4014 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1otNW7P1GVgWeRoRAiSpAJ4jGhjyEnI2aqCM6pgC8KWSWRkDugCgkVMK rd/YNziDK3TNRhI3yKNrLVw= =w6ht -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 14 Jul 2005 16:57:01 +0100
parents 2fe8d66e3075
children 7e4843b7efd2
line wrap: on
line source

#!/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