mergetools / vimdiff2on commit t5304: rename "sha1" variables to "oid" (cc80c95)
   1. "$MERGE_TOOLS_DIR/vimdiff"