tests/test-merge3
author Vadim Gelfer <vadim.gelfer@gmail.com>
Tue, 02 May 2006 14:38:32 -0700
changeset 2178 00205fe76993
parent 1933 7544700fd931
permissions -rwxr-xr-x
merge with crew.

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