tests/test-conflict
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 28 Jun 2007 16:18:09 +0200
changeset 4735 8d4fac0a9df7
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
Make hg glog abort if unused arguments are given.

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