How just to intercept merging “conflicts”, nothing else

[Marcin Kasperski]

> This is part of a test & documentation project of an advanced Python
> IDE, where Mercurial is available as a fully integrated add-on. That's
> why I (try to) put myself into Mr. Normal User's skin, filtering out
> proactively his possible difficulties. For more info, see URL:
> http://eric-ide.python-projects.org/eric-documentation.html

In case of IDE you may consider providing merge machinery yourself, be
it prompt, instruction, kdiff3/meld four-pane editor, or whatever.
Mercurial will be happy to call your script with appropriate parameters
(and if you set premerge to true, will try internal merge first and call
you only in case of unresolved conflicts).

(note that you may override merge tool configuration by command line to
avoid dependency on mercurial.ini/.hgrc)