mergetools / vimdiff2on commit Merge branch 'jk/doc-cvs-update' into maint (3d0049e)
   1. "$MERGE_TOOLS_DIR/vimdiff"