Merge tools

[Didly]

On Tue, Nov 23, 2010 at 6:29 PM, Kevin Bullock <
kbullock+mercurial at ringworld.org <kbullock%2Bmercurial at ringworld.org>>wrote:

> 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
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>

I use Araxis Merge (http://www.araxis.com/merge/). It is in my opinion the
best diff tool there is on windows. Its pros are:

- Really good folder comparison tool. It shows both folders as side-to-side
folder/file hierarchies, and it is really easy to see the differences. It
also supports filtering (showing only the files which are different, those
that are only found on one folder, etc).
- The file comparison tool has syntax highlighting support for many file
types.
- You can add synchronization links to help the file comparison.
- Good three-way merge support.
- Good integration with TortoiseHg.
- Has an image comparison tool, although I have not really used it myself.
- Has support for comparing tabular data.
- Very responsive, modern and easy to use interface, and has a good
integration with Windows.

Now for the cons:
- It is not free! (99 E for the standard edition, I believe).

Other than the fact that it is not freeI have not found a better diff tool.
I've seen tools that are almost as good when comparing files, but nothing as
good when comparing folders.

Cheers,

Angel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20101123/92603bd5/attachment.htm>