view tests/test-conflict @ 5267:b962f82cfd61

Atom support: replaced xhtml namespace prefix with default namespace
author Robert Bachmann <rbach@rbach.priv.at>
date Thu, 30 Aug 2007 18:55:56 +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