Re:Difftastic: Syntax-aware structured diff tool
by omgtehlion on Thursday July 08, 2021 @06:24AM
(#27770186)
And theirs Git UI, gmaster, includes the same diff tech too.
I do not use it for everyday tasks, but when I need to understand complex and/or big changes this is my go-to tool.
https://www.plasticscm.com/features/xmerge