Use diff's -w switch only on Windows, to avoid problems with inconsistent

newline representations.  Per buildfarm results and subsequent discussion.
Sync up a couple of other places that had their own policies.