tests/test-conflict
author Eric Hopper <hopper@omnifarious.org>
Thu, 17 May 2007 20:09:44 -0700
changeset 4439 871ff96a86cc
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
Add a test for the Branch header being in hg export.

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