Merge tools

Erik Zielke ez at aragost.com
Thu Nov 25 04:21:56 CST 2010


2010/11/24 Scott Palmer <swpalmer at gmail.com>:
>
>
> On Tue, Nov 23, 2010 at 12:29 PM, Kevin Bullock
> <kbullock+mercurial 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.
>
> I bet a little AppleScript to wrap FileMerge would do the trick - I just
> don't know much AppleScript :-(
> I also have heard good things about BeyondCompare ($50 USD for a single
> license)
> http://www.scootersoftware.com/index.php
> I find kdiff3 is ugly and awkward.  TortoiseMerge (comes with TortoiseSVN)
> for those on Windows isn't too bad.
> Scott

Yes. I have the same opinion on kdiff3, which was why I asked.

But thanks a lot for everyones input, I will try the different ones out.

--
Erik


More information about the Mercurial mailing list