How just to intercept merging “conflicts”, nothing else

[Pietro Moras]

The simplest, more
direct way for instructing (i.e.:  configuring) Mercurial (I mean: 
just Mercurial, no other products, nor tools):
 – Please just
intercept possible source merge “conflicts”, nothing else, as I
intend to take full responsibility of them.



I kindly ask a practical
suggestion on this topic as, after having read such notes as
“MergeToolConfiguration
– Mercurial”, I feel more confused than before.

And,
please, if you don't appreciate such a question, I'd appreciate if you
just ignored it. Thanks!

 - P.M.
 		 	   		  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20140205/1e581d6e/attachment-0002.html>