mergetools / gvimdiff2on commit builtin/mktree: convert to struct object_id (83eb080)
   1. "$MERGE_TOOLS_DIR/vimdiff"