git diff --color-words is good. Here's what that looks like on the same file: http://www.jefftk.com/diff-color-words-2x.png