tests/test-conflict
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 27 Apr 2006 13:11:23 +0200
changeset 2140 6447a32aefce
parent 1933 7544700fd931
child 2283 e506c14382fd
permissions -rwxr-xr-x
Make the deprecated forget an alias of debugforget. This way it doesn't show up in the non-debug help.

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
HGMERGE=merge; export HGMERGE
hg up -m 1
hg id
egrep -v ">>>|<<<" a
hg status