tests/test-conflict
author Robert Bachmann <rbach@rbach.priv.at>
Thu, 30 Aug 2007 16:42:17 +0200
changeset 5266 46c5e1ee8aaa
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
Added support for the Atom syndication format

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