Comment by psantosl

Plastic SCM developed Semantic Merge and diffing about a decade ago