Merge tools

Kevin Bullock kbullock+mercurial at ringworld.org
Tue Nov 23 11:29:11 CST 2010


On Nov 23, 2010, at 7:53 AM, Erik Zielke wrote:

> Hi all,
> 
> 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?

FileMerge, from the OS X developer tools. 3-pane merge view with editable result, much like kdiff3. The only downside is that in my setup, it has to launch the app for each file, and to get hg to proceed with the merge you have to quit the app. Then it launches again for the next file, etc., etc. It's possible there's a better way to set this up.

Kaleidoscope <http://www.kaleidoscopeapp.com/> also looks interesting (and provides image comparison tools), but I haven't shelled out for it. It comes with 'Mercurial integration', whatever that means... my guess is they 'kindly' add a merge tool config section to your .hgrc.

I should say that although Emacs is my primary text editor, I found its merge tool horrendous.

pacem in terris / mir / shanti / salaam / heiwa
Kevin R. Bullock



More information about the Mercurial mailing list