Fix detection of (missing) diffmerge.exe