tests/test-conflict
author Matt Mackall <mpm@selenic.com>
Wed, 02 Apr 2008 18:51:06 -0500
changeset 6454 eec89a03db08
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
coal: even more tweaks - rearrange file browser columns - add folder and file icons - make browse table uniformly monospaced - use lowercase consistently for column heads - fix search container div

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