Fri, 27 Jan 2012 18:43:31 -0600 merge with i18n stable
Matt Mackall <mpm@selenic.com> [Fri, 27 Jan 2012 18:43:31 -0600] rev 16004
merge with i18n
Fri, 27 Jan 2012 12:25:02 +0400 i18n-ru: synchronized with bf502ccc46d7; fuzzies removed stable
Alexander Sauta <demosito@gmail.com> [Fri, 27 Jan 2012 12:25:02 +0400] rev 16003
i18n-ru: synchronized with bf502ccc46d7; fuzzies removed
Thu, 26 Jan 2012 16:56:11 +0400 i18n-ru: fix typos in `resolve` help stable
Nikolaj Sjujskij <sterkrig@myopera.com> [Thu, 26 Jan 2012 16:56:11 +0400] rev 16002
i18n-ru: fix typos in `resolve` help * help entry is called 'merge-tools', not 'merge-tool'; * envvar is called HGMERGE, not HGEMERGT.
Thu, 26 Jan 2012 20:34:57 -0600 merge: defer symlink flag merging to filemerge (issue3200) stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jan 2012 20:34:57 -0600] rev 16001
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.
Thu, 26 Jan 2012 17:54:52 -0600 help: fix publish option spelling in phases topic stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jan 2012 17:54:52 -0600] rev 16000
help: fix publish option spelling in phases topic
Thu, 26 Jan 2012 17:54:22 -0600 help: add missing phase config items to config topic stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jan 2012 17:54:22 -0600] rev 15999
help: add missing phase config items to config topic
Thu, 26 Jan 2012 17:23:43 -0200 help/phases: remove trailing whitespace stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 26 Jan 2012 17:23:43 -0200] rev 15998
help/phases: remove trailing whitespace
Thu, 26 Jan 2012 11:23:15 -0600 sslutil: more helpful fingerprint mismatch message stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jan 2012 11:23:15 -0600] rev 15997
sslutil: more helpful fingerprint mismatch message This will aid debugging for users of sites that renew certs.
Thu, 26 Jan 2012 11:23:14 -0600 help: add phases topic stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jan 2012 11:23:14 -0600] rev 15996
help: add phases topic
Thu, 26 Jan 2012 12:09:14 -0200 i18n-pt_BR: synchronized with 0b05e0bfdc1c stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 26 Jan 2012 12:09:14 -0200] rev 15995
i18n-pt_BR: synchronized with 0b05e0bfdc1c
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip