tests/test-conflict
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 12 May 2006 21:25:07 -0700
changeset 2275 714f4d25a7a9
parent 1933 7544700fd931
child 2283 e506c14382fd
permissions -rwxr-xr-x
Fix hgweb.filediff The third argument to hgweb.diff should be a list, not a string. This fixes a bug found by xorAxAx, where hgweb would also show the diff for "README" when you ask for the diff for "Demo/cgi/README".

#!/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"
HGMERGE=merge; export HGMERGE
hg up -m 1
hg id
egrep -v ">>>|<<<" a
hg status