revset: fix 'remote()' failure when remote repo has more revs than local
current 'remote()' implementation uses 'r' variable, even if it is not
initialized when 'if n in repo' is not true.
this causes unexpected exception.
i18n-ru: synchronized with
bf502ccc46d7; fuzzies removed
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.
sslutil: more helpful fingerprint mismatch message
This will aid debugging for users of sites that renew certs.
i18n-pt_BR: synchronized with
0b05e0bfdc1c