tests/test-conflict
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 06 Sep 2006 02:15:33 +0200
changeset 3061 fe5c92529d1c
parent 2283 e506c14382fd
child 4361 46280c004f22
permissions -rwxr-xr-x
hgk.py: fix warnings from pychecker - unused variables - usage of undefined variables (opts and filterfiles)

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