mergetools / vimdiff2on commit upload-pack: rename a "sha1" variable to "oid" (62b89d4)
   1. "$MERGE_TOOLS_DIR/vimdiff"