view tests/test-conflict @ 4741:87a35bb58b88

mercurial.spec: fix when default python prefix != rpm %{_prefix} e.g. on SUSE Linux Enterprise 10
author Adam Spiers <hg@adamspiers.org>
date Sat, 02 Jun 2007 12:42:47 +0100
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