mergetools / vimdiff3on commit http-push: convert some static functions to struct object_id (8eb9460)
   1. "$MERGE_TOOLS_DIR/vimdiff"