tests/test-conflict
author Matt Mackall <mpm@selenic.com>
Wed, 12 May 2010 14:49:46 -0500
changeset 11167 b5ef95b5ae14
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
convert/svn: fix long line

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