tests/test-conflict
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 08 Aug 2007 12:27:20 +0200
changeset 5122 c80af96943aa
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
refactor options from cmdtable - add extracommitopts for user and date - factor stuff

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