view tests/test-conflict @ 6486:960bc707ea10

doc: escape .hg at bol in manpages with make (issue1072)

This works around a bug in old docbook stylesheets.
Remove .*.swp example from hgignore.5.txt.

Diagnosis and workaround thanks to Alexis S. L. Carvalho.

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