tests/test-conflict
author Matt Mackall <mpm@selenic.com>
Sun, 10 Jun 2007 19:16:20 -0500
changeset 4535 121999244123
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
hg serve: don't lookup user-supplied names/addresses

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