tests/test-conflict
author Peter van Dijk <peter@dataloss.nl>
Tue, 21 Feb 2006 22:23:51 +0100
changeset 1923 7d83a351a936
parent 814 0902ffece4b4
child 1925 c71420b186b0
permissions -rwxr-xr-x
fix testsuite for freebsd and one timingissue

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "0 0"
echo "something" > a
hg commit -m branch1 -d "0 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "0 0"
HGMERGE=merge; export HGMERGE
hg up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status