tests/test-merge3
author Lee Cantey <lcantey@gmail.com>
Mon, 21 Aug 2006 17:47:02 -0700
changeset 2970 12d1475b48df
parent 1933 7544700fd931
permissions -rwxr-xr-x
Ignore .DS_Store directories These are used by Finder on OS X.

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