gendoc: do not strip 'hg ' from synopsis This was an old left-over from when the synopsis line was used as a header. We now have the command name by itself as the header and the synopsis as a literal block immediately after..

gendoc: support multi-line synopses

gendoc: re-add indentation to global option table The indentation was lost in bdc1cf692447.

test-transplant: test transplanted() revset

backout: add --tool argument for specifying merge tool

help: improve merge-tools topic, describe --tool and clarify details This doesn't make it simpler, but it makes it more correct. With help from erikz, mg and abuehl.

help: use Windows cmd compatible quoting in revset help

color: give hint to translators about untranslated keywords

i18n: extract comments marked for translator hints Comments marked with "i18n:", like: # i18n: do not translate the field names msg = _("Valid entries for the format field are topic, bar, number.") will become available for translators in the .po files: #. i18n: do not translate the field names msgid "Valid entries for the format field are topic, bar, number." msgstr ""

setup/hg: handle hg being a symlink when appending relative libdir to sys.path Resolve symbolic links in the path to hg so that an hg that works when invoked directly will also work when invoked via a symlink to it.