mergetools / vimdiff2on commit Sync with maint to grab trivial doc fixes (fb56570)
   1. "$MERGE_TOOLS_DIR/vimdiff"