tests/test-merge3
author Vadim Gelfer <vadim.gelfer@gmail.com>
Fri, 18 Aug 2006 15:53:14 -0700
changeset 2949 7356fa3cff2c
parent 1933 7544700fd931
permissions -rwxr-xr-x
add other dir/file case to test for issue322.

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