tests/test-merge3
author Lee Cantey <lcantey@gmail.com>
Mon, 09 Jul 2007 10:59:49 -0700
changeset 4849 8c5aca855b5d
parent 1933 7544700fd931
permissions -rwxr-xr-x
Correct inadvertent line ending change.

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