SemanticMerge is out Language-aware diff and merge tool

Amazing tool. Next thing: XML support! Imagine merging nibs the easy way... Mouthwatering.