mergetools / vimdiff2on commit Merge branch 'ts/doc-build-manpage-xsl-quietly' into maint (7532a18)
   1. "$MERGE_TOOLS_DIR/vimdiff"