tests/test-conflict
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Tue, 22 Jan 2008 10:45:55 +0100
changeset 5928 3340aa5a64f7
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
hgweb: move HTTP content types out of header templates This removes the ability for templates to add custom HTTP headers, which can easily be re-added if someone needs it. Thanks to asak for repeatedly reviewing this patch and helping to iron out the quirks.

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