tests/test-conflict
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Fri, 21 Mar 2008 12:05:01 +0100
changeset 6337 d2713d902524
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
give better error message on non-existent mapfile (issue813)

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