Could you please integrate ExamDiff Pro as a predefined option in Options > Diff > External Diff / Merge drop-downs.

Registry Location:

Computer\HKEY_CURRENT_USER\Software\PrestoSoft\ExamDiff Pro\ExePath = %ProgramFiles%\ExamDiff Pro\ExamDiff.exe

Diff command:

"C:\Program Files\ExamDiff Pro\ExamDiff.exe" $LOCAL $REMOTE

Merge command:

Coming back soon with more details

Please see ExamDiff help page for details on parameters (they have a trial version to try them on):
http://www.prestosoft.com/edp_versioncontrol.asp

Thank you,
Dan