i18n-pt_BR: synchronized with
60101427d618
setup.py: don't call splitlines twice on the output of xcodebuild (
issue3277)
merge with stable
mercurial/filemerge.py in the default branch does not need the additional
unlink calls, because the unlink calls at the end of filemerge.filemerge()
are called for internal:dump, too.