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?