Wilfred/difftastic: a diff that understands syntax ?? Command line diff tool that is language aware and that has a side-by-side view.