tests/test-conflict
author Bryan O'Sullivan <bos@serpentine.com>
Thu, 09 Aug 2007 20:03:34 -0700
changeset 5139 49554ba98951
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
debugstate: print symlinks as 'lnk', not '777'

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