http://www.scootersoftware.com/vbulletin/showthread.php?p=24...
It is a newer commercial product with several rough edges, but now there's a "community edition" to try out (it's possible to use just the diff/merge tool without obtaining a license key to setup the server portion):
http://codicesoftware.blogspot.com/2010/11/building-plastic-...