mergetools / vimdiff3on commit streaming: convert open_istream to use struct object_id (ef7b519)
   1. "$MERGE_TOOLS_DIR/vimdiff"