tests/test-conflict
author Adrian Buehlmann <adrian at cadifra.com>
Wed, 14 May 2008 01:08:51 +0200
changeset 6614 944a292d522a
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
doc/hgrc.5.txt: add anchors for sections Enables links into hgrc.5.html of the form: hgrc.5.html#section

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