view tests/test-conflict @ 5341:bd706eb8bc25

darcs2hg: Added support for darcs tags.
author Terry Smith <terry@t11e.com>
date Tue, 11 Sep 2007 13:30:37 -0400
parents 93a4e72b4f83
children
line wrap: on
line source

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