view tests/test-conflict @ 6061:de08788511d7

test-keyword: make it run under Windows

- don't cat symlink, content differs
- rewrite OS specific messages
- generate symlink with a bundle

#!/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