mergetools / gvimdiff3on commit object: convert parse_object* to take struct object_id (c251c83)
   1. "$MERGE_TOOLS_DIR/vimdiff"