mergetools / vimdiff3on commit builtin/pull: convert portions to struct object_id (14bb40b)
   1. "$MERGE_TOOLS_DIR/vimdiff"