view tests/test-conflict @ 4561:a73d80d6385a

Revive commands.dispatch as a simple way to call hg from other pythons scripts.

This was already used by hg-ssh and others and is really convenient if you
just want a native equivalent of calling the command line version.

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