Semantic and visual merge (codicesoftware.blogspot.com)

Introducing a new way of displaying structural differences and merge conflicts with our semantic merge tool. Do you like it?