tests/test-conflict
author Greg Ward <greg-hg@gerg.ca>
Mon, 20 Apr 2009 21:10:39 -0400
changeset 8093 70d8f70264c4
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
run-tests: move bits of main program so it's all at the bottom.

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