mergetools / gvimdiff3on commit notes: convert internal parts to struct object_id (89c149f)
   1. "$MERGE_TOOLS_DIR/vimdiff"