kill some trailing whitespace

merge with crew-stable

coal/paper: add missing spaces in changeset child formatting

cmdutil.logmessage: options should be optional

bookmarks: work around missing posixfile_nt.readline()

Update win32 merge tools configuration Add WinMerge and Beyond Compare 3 to default merge tools configuration. Fix TortoiseMerge configuration.

diffstat: don't fail on merges First version by Alexander Solovyov <piranha@piranha.org.ua>

Package hgk Tcl/Tk script in win32 installer hgk script will be copied to Contrib/hgk.tcl

Update mercurial.ini file packaged in win32 installer Update contrib/win32/mercurial.ini file with contrib/sample.hgrc content and append contrib/mergetools.hgrc content during installation

Merge with crew-stable

Document how HTML documentation is built under Windows

Add Lee Cantey's installer icon to win32 installer Add Lee Cantey's installer icon to contrib/win32 and update mercurial.iss accordingly

notify: fix neglect of custom headers set via template e981725da3fe introduced a bug that discarded all custom headers. Add custom header to test template.

branch closing: add test for branch closing (and reopening)

branch closing: referencing open and closed branches/heads Treat fully closed branches similarly to "inactive" in the output of 'hg branches'. They will be suffixed with "(closed)" where inactive branches are marked with "(inactive)". If the -a/--active option is given both inactive and closed branches will not be shown. Partially closed branches (multiple heads, at least one not closed) will display the next (tipmost) open head. Add -a/--active option to "hg heads" which will hide closed heads iff the option is specified. In other hg commands, when multiple branch heads exist the branch name will refer to the tipmost open head, and if none exist, then the tipmost closed head.