view tests/test-conflict @ 11208:2313dc4d9817

tests: fix bashism to load helpers.sh `source` isn't available at POSIX sh.
author Yuya Nishihara <yuya@tcha.org>
date Fri, 21 May 2010 20:55:18 +0900
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