A Guide to Branching in Mercurial

[Adrian Buehlmann]

On 07.09.2009 22:47, Neal Becker wrote:
> Martin Geisler wrote:
> ...
>>     hg merge --config ui.merge=internal:local good bad
> 
> I've been looking around, but so far haven't found an explanation of this 
> syntax or related options.  Where can I find out about merge=internal?

See 'hg help merge -v' for the (global) --config option

(admittedly, there isn't _that_ much text about '--config')

--config provides access to the config options as used in .hgrc

See http://www.selenic.com/mercurial/hgrc.5.html#ui

http://mercurial.selenic.com/wiki/MergeToolConfiguration might
also be helpful