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