Which merge tool should I use with Mercurial in Windows?

Question

Hi,

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).

Thanks for your time. Best regards.

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!

Answer 2

I've used DiffMerge which is available for free.

Take a look at the screenshots to get an idea of how it works, I found the interface pretty intuitive.

Good luck!

Answer 3

WinMerge works great...

Edit: This might be useful:

• Mercurial MergeProgram

Answer 4

Beyond Compare is the gold standard for compare/merge tools. I've used it as well as many of the free ones mentioned and can tell you it's worth the $50.

They have a page here that discusses configuration for a variety of SCM packages.

Answer 5

i use p4merge. http://www.perforce.com/perforce/products/merge.html

it's beatiful and very clear.

here shows how can you configure.