mergetools / gvimdiff2on commit builtin/cat-file: convert struct expand_data to use struct object_id (cd4f77b)
   1. "$MERGE_TOOLS_DIR/vimdiff"