I like, no NEED, word-based diff to make my life bearable. Apple's FileMerge and Xcode internal diff tool get this very, very right. Unfortunately, SourceTree is a much better VCS client application, particularly when using the internal diff view, so it appears that my life will never be complete.

Thanks!