Use "google-diff-match-patch" as a diff tool
(http://code.google.com/p/google-diff-match-patch/)