i18n-sv: synchronized with
44b4a2a31623
mergetools: improve configuration for several merge tools
* meld - provide labels for the three panes
* diffmerge - add registry key for detection, improve arguments
* beyond compare - add linux version
* winmerge - improve arguments
* araxis - add configuration, including registry key for detection
* misc - provide default priorities for more tools
hgrc.5: document use of environment variables on Windows
This feature was introduced in
c31ac3f7fd8f
i18n-pt_BR: synchronized with
44b4a2a31623
url: fix python < 2.6 with ssl installed
_GLOBAL_DEFAULT_TIMEOUT isn't related to ssl, but to python < 2.6, move it to
the right hunk.
bugzilla: revert unhelpful check-code changes, module is actually called MySQLdb
bundle: exclude csets given in --base, unless they are in --rev (
issue1910)
Thanks Jesse Glick for the first version of this patch.