http://codicesoftware.blogspot.com/2013/07/semanticmerge-goes-visual.html

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