i want a diff tool that shows me exactly which tokens have changed, and which haven't, regardless of how they are laid out. These already exist: https://github

i want a diff tool that shows me exactly which tokens have changed, and which haven't, regardless of how they are laid out. These already exist: https://github.com/Wilfred/difftastic https://github.com/Wilfred/difftastic when we get that, then we should get even less merge conflicts. Counterintuitively, that is not the case. AST-merge is a much, much, much, much, much harder problem than AST-diff. https://github.com/Wilfred/difftastic?tab=readme-ov-file#can-difftastic-do-merges https://github.com/Wilfred/difftastic?tab=readme-ov-file#can... The fact that diffs can be used to drive a 3-way merge is in fact an accidental property that arises due to the sheer crudeness of the line-based diff format. As soon as you start using more-sophisticated diff formats, solutions to "the diff problem" no longer lead directly to solutions to "the merge problem".