Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 02 Aug 2012 13:51:49 +0200] rev 17422
mergetools.hgrc: set vimdiff to check=changed
The standard reaction in from of unexpected vimdiff is to ":quit". This will
make vimdiff return a 0 status even if no merge were done at all.
This change detect that nothing have been changed in vimdiff as a potential
unresolved conflict.
Mads Kiilerich <mads@kiilerich.com> [Wed, 29 Aug 2012 02:09:43 +0200] rev 17421
hgweb: avoid bad $$ processing in graph (issue3601)
JavaScript .replace always magically processed $$ $& $' $` in replacement
strings and thus displayed subject lines incorrectly in the graph view.
Instead of regexps and .replace we now just create the strings the right way in
the first place.
Steve Borho <steve@borho.org> [Wed, 29 Aug 2012 13:16:56 -0500] rev 17420
wix: pick up new template files
Matt Mackall <mpm@selenic.com> [Sat, 01 Sep 2012 12:49:43 -0500] rev 17419
Added signature for changeset 072209ae4ddb
Matt Mackall <mpm@selenic.com> [Sat, 01 Sep 2012 12:49:39 -0500] rev 17418
Added tag 2.3.1 for changeset 072209ae4ddb
Matt Mackall <mpm@selenic.com> [Sat, 01 Sep 2012 12:48:08 -0500] rev 17417
merge with crew
Martin Schröder <martin.schroeder@nerdluecht.de> [Sat, 01 Sep 2012 14:31:31 +0200] rev 17416
i18n-de: synchronized with 20665910d9d9; fix Bug 3082
Wagner Bruna <wbruna@yahoo.com> [Fri, 31 Aug 2012 21:49:52 -0300] rev 17415
i18n-pt_BR: synchronized with bdd248666dbc