wix: drop python2 conditionals
Differential Revision: https://phab.mercurial-scm.org/D12595
tests: fix misspelling of supersede
Differential Revision: https://phab.mercurial-scm.org/D12589
filemerge: add configs to disable some or all partial merge tools
When rolling out partial merge tools to users, it's useful to be able
to easily turn one or all of them off if a problem is discovered. This
patch adds support for that. They can of course also be useful for
individual users to be able to temporarily turn off a tool they are
otherwise using.
Differential Revision: https://phab.mercurial-scm.org/D12588
censor: fix [hg update] away from a revision with censored files
Differential Revision: https://phab.mercurial-scm.org/D12604
censor: demonstrate a bug
Differential Revision: https://phab.mercurial-scm.org/D12584
Added signature for changeset
0ddd5e1f5f67
Added tag 6.1.2 for changeset
0ddd5e1f5f67