view tests/test-conflict @ 5166:7706ff46ef45

The >| redirection does not exist in plain sh.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 02 Aug 2007 14:51:49 +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