mergetools / vimdiff2on commit branch: convert to struct object_id (48713bf)
   1. "$MERGE_TOOLS_DIR/vimdiff"