A little while ago I was contacted about a new merge tool from the company behind PlasticSCM . (I haven't used Plastic myself, but I'd heard of it.) My initial reaction was that I wasn't interested in anything which required me to learn yet another source control system, but SemanticMerge...