Merge tools

[Hans Meine]

Op den Dingsdag 23 November 2010 Klock 14:53:57 hett Erik Zielke schreven:
> I would like too know which merge-tool or merge-tools (e.g. kdiff3)  do
> you use for mercurial and why, i.e. the pros and cons of using that
> merge-tool?

xxdiff.  Absolutely optimized for this use case (merging), see the webpage.  
There might be prettier programs, but this one allows me to do everything I 
need in the most efficient way possible.

HTH,
  Hans