tests/test-merge3
author Josef "Jeff" Sipek <jeff@josefsipek.net>
Sat, 19 Aug 2006 15:20:54 -0400
changeset 3043 2a4d4aecb2b4
parent 1933 7544700fd931
permissions -rwxr-xr-x
Merge with Brendan Cully

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