Codice Software

Free
semanticmerge is a language-dependent source code merge tool.
Free
A configuration management system from Codice Software.