tests/test-merge3
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 02 Nov 2005 16:08:48 -0800
changeset 1488 08c7851969cc
parent 814 0902ffece4b4
child 1933 7544700fd931
permissions -rwxr-xr-x
only files in normal state should be marked as deleted fix a traceback when you removed an added file

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