tests/test-conflict
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 09 Jun 2007 13:17:58 +0200
changeset 4532 c3a78a49d7f0
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
Some small cleanups for convert extension: - repo doesn't need to be imported - util.Abort doesn't need \n - space after comma - long lines - spacing

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