(bug 619) be intelligent about finding the "diff3" executable. firstly, make sure