tests/test-merge3
author Peter van Dijk <peter@dataloss.nl>
Wed, 22 Feb 2006 15:57:43 +0100
changeset 1926 ba198d17eea9
parent 814 0902ffece4b4
child 1933 7544700fd931
permissions -rwxr-xr-x
changes by John Levon to standardize some erroroutput

#!/bin/sh

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