tests/test-conflict
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Mon, 03 Nov 2008 20:05:03 +0100
changeset 7309 e74a9173c2d7
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258) This gets us git diffs when enabled and doesn't pick erratic file parents.

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