DiffMerge can be configured as an external compare / merge tool with various third-party version control systems.  Usually this just involves formatting the correct command line template string in the package’s options dialog or configuration file.  Here are instructions for some popular packages.