view tests/test-conflict @ 6459:8189e03adb44

hgweb: make hgwebdir work in the absence of PATH_INFO

Thanks to Andrea Arcangeli for reporting and an initial patch.

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