Compare folders and files on Mac OS X

On Windows I had WinMerge, but on a Mac?

I’ve installed KDiff3, and it seems to work fine. Nonetheless it could be improved, with those WinMerge arrows that overwrite changes in parallel.