tests/test-merge3
author Patrick Mezard <pmezard@gmail.com>
Thu, 21 Jun 2007 22:19:41 +0200
changeset 4673 d8442fc0da8d
parent 1933 7544700fd931
permissions -rwxr-xr-x
Merge with crew

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