tests/test-conflict
author Brendan Cully <brendan@kublai.com>
Thu, 23 Aug 2007 13:59:52 -0700
changeset 5235 988ed47d9d65
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
mq: some improvements to header rewriting (closes #690) Tested with qrefresh -m against the mm series.

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