mergetools / gvimdiff3on commit builtin/merge: convert to struct object_id (5268431)
   1. "$MERGE_TOOLS_DIR/vimdiff"