I'm a big fan of Filemerge. I also really like Changes. I just prefer Kaleidoscope's UI better. It has all the features for my needs in the recent version 2 release. Black Pixel makes fine software and Kaleidoscope is no exception.