Default Diffmerge Regkey is no longer correct
I am currently using Diffmerge 3.3.1 (x64) and THG 2.2.
The default regkey for Diffmerge is no longer correct, meaning THG is not able to auto-configure Diffmerge as the merge tool.
I was able to fix the problem on my machine by configuring
This is somewhat related to an older ticket which deals with the 64-bit issue relating to diffmerge: