view tests/test-conflict @ 6205:b193a6e59131

mq: test for qclone of http repo+queue

tests f857eac30cd5 and 0c2b443fb3c3

#!/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"
hg merge 1
hg id
cat a
hg status