mergetools / gvimdiff3on commit RelNotes/2.21: misc typo/English fixups (e9bd4aa)
   1. "$MERGE_TOOLS_DIR/vimdiff"