mergetools / gvimdiffon commit builtin/cat-file: convert some static functions to struct object_id (63ecb99)
   1. "$MERGE_TOOLS_DIR/vimdiff"