tests/test-conflict
author Mads Kiilerich <mads@kiilerich.com>
Wed, 21 Jul 2010 17:51:37 +0200
branchstable
changeset 11639 a0c5f531daab
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
doc: make sure we use our own code for generating man pages docutils would in some situations pick up its own manpage.py instead of doc/manpage.py. Renaming to hgmanpage.py makes it less ambiguous.

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