tests/test-conflict
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 14 Dec 2006 19:30:18 +0100
changeset 3883 6081b4c68baf
parent 2283 e506c14382fd
child 4361 46280c004f22
permissions -rwxr-xr-x
Corrected synopsis for many commands. Use CMD instead of FILE for -e and --remotecmd (thanks, Neal Becker)

#!/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 merge 1
hg id
egrep -v ">>>|<<<" a
hg status