tests/test-conflict
author Giorgos Keramidas <keramida@ceid.upatras.gr>
Tue, 15 Aug 2006 20:59:55 +0300
changeset 2904 8ca608c1eb02
parent 2283 e506c14382fd
child 4361 46280c004f22
permissions -rwxr-xr-x
tests: new test for mq qdiff command `hg qdiff .' is supposed to work but it is currently broken. This test should help us verify when it gets fixed.

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