tests/test-merge3
author mpm@selenic.com
Tue, 13 Sep 2005 18:38:27 -0500
changeset 1236 67a28636ea64
parent 814 0902ffece4b4
child 1933 7544700fd931
permissions -rwxr-xr-x
Fix bug with co -C across branches, update tests

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