tests/test-conflict
author Christian Ebert <blacktrash@gmx.net>
Thu, 28 Jun 2007 02:11:54 +0200
changeset 4817 c10d3bc05a8d
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
setup.py not executable: change instructions at beginning of file

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