merge: supply base node to merge tools in the environment Merge tools will be able to exploit this to correctly merge backouts. This won't work fully, though, until issue 1327 is solved, since the node information is not necessarily correct.

test-bisect: normalize shell error message Different shells on vary in their error messages. Here we're satisfied if the shell mentions './foobar' at all.

run-tests: add "debug" mode: don't capture child output, just show it. In debug mode, we: - don't try to diff expected vs actual output - disallow --interactive - disable timeouts (warn if user tried to supply one) - don't try to parse hghave output, since we don't have the output - don't try to save output to .err file

run-tests: make --tmpdir option more useful. - instead of creating HGTMP inside tmpdir, now HGTMP is tmpdir (thus, fail if tmpdir already exists) - passing --tmpdir automatically turns on --keep-tmpdir

hg.1: kill spurious backslash I believe the backslash prevented asciidoc from automatically turning "(C)" into a real copyright symbol. This replacement is not done in reST in the first place.

help: markup email addresses as inline literals Otherwise we get useless links to user@example.org in the HTML version of the man pages.

doc/Makefile: add help/*.txt as a dependency

doc: add some internal links to man pages

hgrc.5: combined short paragraphs into one Short and precise sentences are good, but we can have more than one such sentence per paragraph.

doc: use reST note directive The 'NOTE: bla bla' syntax was for asciidoc and is still present in a couple of docstrings. The docstrings will be converted to reST format when minirst knows how to handle it.