tests/test-merge3
author Lee Cantey <lcantey@gmail.com>
Thu, 13 Jul 2006 09:50:51 -0700
changeset 2611 1b4eb1f92433
parent 1933 7544700fd931
permissions -rwxr-xr-x
Add merge to list of required tools.

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