Kaleidoscope is very pretty (as is its website), but the lack of ability to do any editing/merging once you view the diff is jarring. I wish they'd spend their time on that.