Merge tools

[Chris Sutton]

On Tue, Nov 23, 2010 at 7:53 AM, Erik Zielke <ez at aragost.com> 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?
>
> --
> Erik Zielke
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>

I'd recommend these merge tools:

Araxis Merge
- Merge capabilities are excellent
- Costs money
- Has Windows and Mac versions

Beyond Compare
- Very good merge capabilities
- Costs money but is cheaper than Araxis
- Has Windows and Linux versions

DiffMerge
- Has good merge capabilities
- Free
- Has Windows, Linux and Mac versions

Chris
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20101124/cc10430b/attachment.htm>