tests/test-merge3
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 07 Jan 2006 16:34:20 +0100
changeset 1612 0d36e3d7e2ea
parent 814 0902ffece4b4
child 1933 7544700fd931
permissions -rwxr-xr-x
Adjusted test output to match new hgignore error messages.

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