Write a better diff! Make the computer do more work, rather than bending over backwards to fit the whims of your diff. Try searching for "semantic diff" or "t

Write a better diff! Make the computer do more work, rather than bending over backwards to fit the whims of your diff. Try searching for "semantic diff" or "tree-diff" or "syntax-aware diff". http://martinfowler.com/bliki/SemanticDiff.html http://martinfowler.com/bliki/SemanticDiff.html https://www.semanticmerge.com https://www.semanticmerge.com