tests/test-conflict
author Patrick Mezard <pmezard@gmail.com>
Sun, 24 May 2009 18:30:59 +0200
changeset 8611 ba42e3c6e602
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
convert: better feedback when filtering out empty revisions Original patch by Herbert Griebel <herbertg@gmx.at>

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