difftastic (syntax-aware diff)

https://github.com/Wilfred/difftastic

Difftastic is an experimental diff tool that compares files based on their syntax.

supports many languages, does not attempt to handle merges - just on showing humans better diff output