tests/test-conflict
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sun, 02 Nov 2008 22:44:42 +0100
changeset 7304 68374f1c8c87
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
inotify: fix bug in formatting

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