tests/test-conflict
author Patrick Mezard <pmezard@gmail.com>
Sun, 14 Feb 2010 13:05:51 +0100
changeset 10458 7fbba0c04f92
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
Merge with crew-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