There is a product called semanticmerge that does this.