tests/test-conflict
author Martin Geisler <mg@aragost.com>
Fri, 09 Jul 2010 14:01:55 +0200
branchstable
changeset 11522 eaa7666ad53f
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
check-code: add test for callable

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