tests/test-conflict
author Sascha Wilde <wilde@sha-bang.de>
Tue, 27 Jun 2006 21:56:11 +0200
changeset 2528 049f930f18c1
parent 2283 e506c14382fd
child 4361 46280c004f22
permissions -rwxr-xr-x
Workaround to work with less sophisticated sed versions. For example NetBSD sed doesn't know about '\|'.

#!/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"
HGMERGE=merge; export HGMERGE
hg merge 1
hg id
egrep -v ">>>|<<<" a
hg status