merge: remove direct rustmod reference
We shouldn't rely on this member being present in `dirstate.py`, this creates
unnecessary coupling.
This also can trigger certain issues in edge-cases where the policy is changed
at runtime or multiple Python environments fight, which is an added bonus.
Differential Revision: https://phab.mercurial-scm.org/D12217
relnotes: add 6.1
Differential Revision: https://phab.mercurial-scm.org/D12205
relnotes: add 6.0.3
Differential Revision: https://phab.mercurial-scm.org/D12204
windows: adjust test output in test-merge-tools.t
Differential Revision: https://phab.mercurial-scm.org/D12216
windows: generalize output for test-status-tracked-key.t
Differential Revision: https://phab.mercurial-scm.org/D12215
windows: skip a section of a test that is legitimately broken on windows
See the comment in the test itself.
Differential Revision: https://phab.mercurial-scm.org/D12214
heptapod-ci: remove Python 2 support
(hurray!) 6.1 was the last release to support Python 2, let's lighten
the CI.
Differential Revision: https://phab.mercurial-scm.org/D12206
Added signature for changeset
c00d3ce4e94b