There are starting to be more code-aware diff tools. https://github.com/Wilfred/difftastic https://github.com/Wilfred/difftastic I'm currently trying this out

There are starting to be more code-aware diff tools. https://github.com/Wilfred/difftastic https://github.com/Wilfred/difftastic I'm currently trying this out, but I'm not sure if I'll keep using it.