Interesting people keep popping up on the difftastic issue tracker. Here's a discussion of applying structural diff techniques to language-aware merging: https://github.com/Wilfred/difftastic/issues/86#issuecomment-1006790222