tests/test-conflict
author Matt Mackall <mpm@selenic.com>
Mon, 25 Jun 2007 21:18:19 -0500
changeset 4724 a084ed4b0c35
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
Added tag 0.9.4 for changeset fb4b6d5fe100

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