mergetools / gvimdiff3on commit cache-tree: reject entries with null sha1 (a96d3cc)
   1. "$MERGE_TOOLS_DIR/vimdiff"