mergetools / vimdiff2on commit Merge branch 'jt/doc-pack-objects-fix' into maint (60f4851)
   1. "$MERGE_TOOLS_DIR/vimdiff"