Good merge tool for Mac OS X (Araxis Merge alike) ?

Hi group,

Is there any good merge tool out there that can be used to compare two
directories,
e.g. to compare the source of two version branches of the same project?

I know Araxis Merge for Windows, which we use on a daily basis for many
tasks
in our company, but the best I could come up with on Mac OS X is
kdiff3.

And no, FileMerge from Developer Tools is not even worth mentioning if
you know what can be done with A.M. (e.g. 3-way-directory compare,
directly jump to all differences in the compare view, edit the files in
the comparison window and save from there, ...)
;-)

What do *you* use?

regards,
jan

In article <1146900615.066173.184860 DeleteThis @u72g2000cwu.googlegroups.com>,
groups DeleteThis @barnholt.net wrote:

> What do *you* use?

What's wrong with diff?

--
We are the music makers, And we are the dreamers of dreams,
Wandering by lone sea-breakers, And sitting by desolate streams.
from "Ode", Arthur O'Shaughnessy