tests/test-conflict
author Martin Geisler <mg@lazybytes.net>
Mon, 17 May 2010 21:30:00 +0200
changeset 11189 3ef2572de32f
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
Merge with stable

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