tests/test-merge3
author Matt Mackall <mpm@selenic.com>
Mon, 17 Jul 2006 11:30:33 -0500
changeset 2630 837119f1bf4d
parent 1933 7544700fd931
permissions -rwxr-xr-x
Merge with tonfa

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