view tests/test-conflict @ 11236:cfa6a726ef6d stable

record: better way to find help in docstring

This outputs only the lines in the verbatim block without relying on
the translator to have translated the little 'y - record this change'
string.

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