tests/test-conflict
author Paul Bx <pb@e-scribe.com>
Sat, 22 Sep 2007 18:37:35 +0200
changeset 5313 121f961b358c
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
statichttprepo: fix calls on '/' URI (issue 747)

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