tests/test-merge3
author Matt Mackall <mpm@selenic.com>
Tue, 22 Aug 2006 19:12:09 -0500
changeset 2978 962b9c7df641
parent 1933 7544700fd931
child 11177 6a64813276ed
permissions -rwxr-xr-x
merge: add remove to the action hash

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