tests/test-merge3
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 30 Jul 2007 20:06:11 +0200
changeset 5030 c89671c3b062
parent 1933 7544700fd931
permissions -rwxr-xr-x
merge with crew-stable

#!/bin/sh

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