mergetools / gvimdiff3on commit builtin/reset: convert to use struct object_id (3a5d7c5)
   1. "$MERGE_TOOLS_DIR/vimdiff"