view tests/test-conflict @ 8357:d974a32b59dc

spartan: add branches page
author Sune Foldager <cryo@cyanite.org>
date Tue, 12 May 2009 11:58:39 +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