view tests/test-conflict @ 10720:fbcccf9ec58f

check-code: add a return value to checkfile function

The checkfile function returns True if the file is correct, False
otherwise.

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