view tests/test-conflict @ 9484:c96d73dd956d

gendoc: do not wrap encoded string

- it breaks multi-byte characters
- it is not needed since Docutils will take care of wrapping the
  strings as necessary

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