tests/test-merge3
author mpm@selenic.com
Fri, 19 Aug 2005 16:43:30 -0800
changeset 948 ffb0665028f0
parent 814 0902ffece4b4
child 1933 7544700fd931
permissions -rwxr-xr-x
Merge with BOS

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "0 0"