i18n-ru: fix typos in `resolve` help * help entry is called 'merge-tools', not 'merge-tool'; * envvar is called HGMERGE, not HGEMERGT.

merge: defer symlink flag merging to filemerge (issue3200) Previously, we could change a normal file into a corrupt symlink when trying to merge a symlink flag. Now, we leave the flag alone and let filemerge deal with it (usually by a prompt). We also drop a redundant flag setting after filemerge (now dealt with by ms.resolve) that would cause similar corruption.

help: fix publish option spelling in phases topic

help: add missing phase config items to config topic

help/phases: remove trailing whitespace

sslutil: more helpful fingerprint mismatch message This will aid debugging for users of sites that renew certs.

help: add phases topic

i18n-pt_BR: synchronized with 0b05e0bfdc1c

copies: remove stray print

scmutil: unify some 'no changes found' messages This keeps the wording more consistent for secret csets

outgoing: display info about secret changets while no sharable changeset found

bundle: display info about secret changets while no sharable changeset found

test-rebase-collapse: Add test for rebase regression introduced in 12309c09d19a

test-commandserver: test that phase data is being refreshed

localrepo: delete _phaserev when invalidating caches