view tests/test-conflict @ 1410:17703aa4491e

hgweb: shorten all the URLs in the standard templates

A URL like this:

http://www.selenic.com/hg/?cmd=changeset;node=5010207c35273ac1331cae44c253dd41fa07cb7f

is now presented as:

http://www.selenic.com/hg/?cs=5010207c352

(though the old style still works, of course)

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "0 0"
echo "something" > a
hg commit -m branch1 -d "0 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "0 0"
HGMERGE=merge; export HGMERGE
hg up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status