Mercurial: Changelog

Mercurial Mercurial > hg / changelog

Fri, 27 Jan 2012 18:43:31 -0600 merge with i18n stable

changeset

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

changeset

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

changeset

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

changeset

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

changeset

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

changeset

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

changeset

Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 26 Jan 2012 17:23:43 -0200] rev 15998

help/phases: remove trailing whitespace