tests/test-conflict
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Thu, 21 Aug 2008 19:02:56 +0200
changeset 6929 1b15d6e7cc3c
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
bisect: status message when no action is specified

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