It does not fulfill your needs exactly, but it may be a start: http://www.gnu.org/software/wdiff/

I seem to remember a tutorial on setting that up with git, but Google is failing me right now; does anyone know where that might be?