view tests/test-conflict @ 2124:27fd8b7a6c51

Cleaned trailing whitespace in hgweb.py, removed command line shortcut for webdir-conf.

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