Semantic and visual merge

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