test-help.t: fix for non-Linux platforms
merge with mpm
merge: audit the right destination file when merging with dir rename

--HG--
branch : stable
Added tag 2.9.1 for changeset b96cb15ec9e0

--HG--
branch : stable
Added signature for changeset b96cb15ec9e0

--HG--
branch : stable
merge with stable
merge main and crew
extensions: remove the inotify extension (BC)

This extension has always had correctness issues and has been
unmaintained for years. It is now removed in favor of the third-party
hgwatchman which is maintained and appears to be correct.

Users with inotify enabled in their config files will fall back to
standard status performance.

--HG--
extra : rebase_source : c44bc703f73404ef09a883b5e4e9c028c23d35db
extra : amend_source : d1f112cbaab88ae7009abe0bee9287d7446092b7
extensions: remove interhg

Has been built-in for a few releases.

--HG--
extra : rebase_source : 279c36e07f6742fd3585a8171bab92504b9a7f78
extra : amend_source : fb34fea06dfce04cb806b0217431a9ccb8a85ffe
extensions: mark win32text deprecated

Happened a long time ago.

--HG--
extra : rebase_source : 5f7843fa58aef50e262900046b60df569d80362c
extra : amend_source : cdb93ff5f0379dc0890ccf790f7683a410843197
contrib: drop tmplrewrite

Needed for the 1.3 transition in 2009, no longer relevant

--HG--
extra : rebase_source : 18c0c4ceed7d3a10cdba9e211b4a7e9c838bccfe