There must be something better. Hard to be worse. But I don't know of anything.
If you can go non-graphical, there's rsync. Then for diffing inside files, if you have Xcode, there's FileMerge which is hiding in /Applications/Xcode.app/Contents/Applications/FileMerge.app
It's not an integrated solution, though, as Kaleidoscope aspires to be.
Not well regarded if you paid them money for their Kaleidoscope app, which is pretty poor quality.
reply