basic Mercurial merge “conflicts” tool

Tue Feb 4 12:07:38 UTC 2014

I
kindly ask suggestions about what's the best basic off-the-shelf
Mercurial configuration for facing possible merge “conflicts”.
Reason
is I'm not yet ready to face this matter in all its complexity.
Thanks!
 - P.M. 		 	   		  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20140204/ccd70f37/attachment-0002.html>