tests/test-conflict
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sun, 04 Jun 2006 12:19:51 +0200
changeset 2394 a8f1049d1d2d
parent 2283 e506c14382fd
child 4365 46280c004f22
permissions -rwxr-xr-x
hgweb: fix errors and warnings found by pychecker - fix missing import - use type_ instead of type - remove unused variable

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