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