Erik Zielke <ez@aragost.com> [Wed, 20 Oct 2010 16:54:34 +0200] rev 12771
help: help topic for merge tools
I have made a help topic for merge tools. The text in the topic is
based on the http://mercurial.selenic.com/wiki/MergeProgram page from
the wiki, along with some extra information on the internal merge tools.
Martin Geisler <mg@lazybytes.net> [Wed, 20 Oct 2010 10:13:04 +0200] rev 12770
check-code: find trailing whitespace
timeless <timeless@gmail.com> [Wed, 20 Oct 2010 10:07:38 +0200] rev 12769
convert: kill trailing whitespace
timeless <timeless@gmail.com> [Wed, 20 Oct 2010 10:02:54 +0200] rev 12768
convert: fix typo in comment
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 18 Oct 2010 18:31:38 -0200] rev 12767
strip: support revision sets
Augie Fackler <durin42@gmail.com> [Sat, 16 Oct 2010 18:09:47 -0500] rev 12766
interhg: use uisetup() instead of module-load side effects
This fixes an infinite recursion bug caused by visiting a bad subpage
of the help handler repeatedly, which caused the wrapper for the
templater's escape filter to get installed twice and resulted in
infinite recursion.
Steve Borho <steve@borho.org> [Mon, 18 Oct 2010 23:20:14 -0500] rev 12765
merge: when --tool is specified, disable HGMERGE by setting to empty string
HGMERGE has different semantics than ui.merge. HGMERGE should hold the name
on an executable in your path, or an absolute tool path. As such, it's not
safe to simply copy the user's specified --tool value into HGMERGE. Instead,
we disable HGMERGE by setting it to an empty string.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 18 Oct 2010 14:10:36 +0900] rev 12764
ui: only fix config if the relevant section has changed
In particular, when extensions add hooks, or add non-ui and non-paths
configuration items during their setups, we really have no reason
to re-"fix" the config dictionaries.