tests/test-conflict
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 17 Aug 2007 19:11:16 +0200
changeset 5188 831ebc408ffb
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
Adjust contrib/hg-ssh for moved dispatch() function.

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