view tests/test-conflict @ 5471:5b81c1cc6ebe

tests: make test-mq-guards work with ksh
author Jim Hague <jim.hague@acm.org>
date Fri, 19 Oct 2007 19:20:33 +0000
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