mergetools / gvimdiff2on commit builtin/commit: convert to struct object_id (8066df4)
   1. "$MERGE_TOOLS_DIR/vimdiff"