Don't use kdiff3, which is ugly under osx