tests/test-conflict
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 19 Dec 2006 15:37:10 +0100
changeset 3937 05c703c281ff
parent 2283 e506c14382fd
child 4361 46280c004f22
permissions -rwxr-xr-x
purge extension doesn't need "#!/usr/bin/env python". (from the Debian package: deb_specific__hgpurge.py.patch)

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