Which merge tool should I use with Mercurial in Windows?

Question

I'm just starting with Mercurial and one of the things that I should do is select a merge tool. I was thinking to use WinMerge for that purpose, but I can't find the way to select this in particular. There are references for all the other merge tools around, but not for WinMerge.

So, should I use WinMerge or there's a better tool for that job (remember, I'm using Windows).

Answer 1

Take a look at kdiff3: http://kdiff3.sourceforge.net/

It was originally designed for KDE/linux but has been ported to Windows. It will diff/merge up to 3 files remarkably intelligently, it does a great job of highlighting differences and suggesting how to merge the files, and it's about as intuitive as one could hope.

Good luck!