tests/test-merge3
author Matt Mackall <mpm@selenic.com>
Mon, 30 Jan 2006 13:01:16 +1300
changeset 1666 0fc1b588976f
parent 814 0902ffece4b4
child 1933 7544700fd931
permissions -rwxr-xr-x
Added tag 0.8 for changeset 3a56574f329a368d645853e0f9e09472aee62349

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