mergetools / vimdiff3on commit read-cache: teach make_cache_entry to take object_id (825ed4d)
   1. "$MERGE_TOOLS_DIR/vimdiff"