tests/test-conflict
author Brodie Rao <me+hg@dackz.net>
Mon, 10 Aug 2009 22:59:29 +0200
changeset 9330 be2a13153372
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
diffstat: scale adds/removes proportionally to graph width The previous method of scaling had a tendency to include graph lines that went past the output width when the file with the most changes had a very large number of changes.

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