mergetools / gvimdiff2on commit diff: convert struct diff_filespec to struct object_id (a0d12c4)
   1. "$MERGE_TOOLS_DIR/vimdiff"