tests/test-conflict
author Josef "Jeff" Sipek <jeffpc@josefsipek.net>
Tue, 29 May 2007 03:27:02 -0400
changeset 4452 862dc0c020ad
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
gitweb: Fixed manifest template opening an extra div tag

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