view tests/test-conflict @ 9461:cec9fb4e07a1

record: remove superfluous space
author timeless@mozdev.org
date Sun, 13 Sep 2009 03:04:40 +0300
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