view tests/test-conflict @ 4521:d634b61e9cec

Add some more smart when initializing destination repository
author Edouard Gomez <ed.gomez@free.fr>
date Thu, 07 Jun 2007 23:16:10 +0200
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