mergetools / gvimdiffon commit cache.h: eliminate SHA-1 deprecation warnings on Mac OS X (6106795)
   1. "$MERGE_TOOLS_DIR/vimdiff"