tests/test-conflict
author Brendan Cully <brendan@kublai.com>
Wed, 29 Aug 2007 16:50:21 -0700
changeset 5267 b817d17c7ee5
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
Make run-tests.py work when invoked outside of tests. This makes it usable for unbundled extensions.

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