tests/test-conflict
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 27 Jun 2007 20:37:33 +0200
changeset 4732 b0520e3903fe
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
Disallow short earlygetop option combined with other short options While "hg commit -qRfoo" can be read as "--quiet --repository foo", "hg commit -mRfoo" should be "--message Rfoo".

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