tests/test-conflict
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 01 Dec 2006 23:16:12 +0100
changeset 3754 cd25a4a1a265
parent 2283 e506c14382fd
child 4361 46280c004f22
permissions -rwxr-xr-x
Improve error message for unknown revlog flags. Old: unknown flags 120000 for ... New: unknown flags 0x0012 for ...

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