RE: How just to intercept merging “conflicts”, nothing else

[Pietro Moras]

What
I've done so far has been a "Mercurial.ini" with:
[ui]
merge
= internal:merge
   And
going through these posts I've discovered it has not been that bad an
idea. Which is reassuring.
Before
that configuration, in case of a merge “conflict”, Mercurial
lamented a long list of “missing modules”, certainly because I
hadn't any such add-on as “Kdiff3”
installed. Which I never will, well, at least not in the near future.
So here I got what I was looking for. Fine. 

But
then reading:
>
 Pietro,
can you clarify?
I
realize that I must be a bit more explicit, and explain the reason
behind all that. Only I feel a bit embarrassed, 'cause I wouldn't
like to annoy anybody with such details. So, just a hint.
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
Thanks!
 - P.M.
 		 	   		  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20140205/287d9dba/attachment-0002.html>