SemanticMerge is out Language-aware diff and merge tool
semanticmerge.comAmazing tool. Next thing: XML support! Imagine merging nibs the easy way... Mouthwatering.
Thank you! :)
XML would be great to have, definitely... vote! http://plasticscm.uservoice.com/forums/196398-mergebegins?fi...