mergetools / gvimdiffon commit Merge branch 'va/mailinfo-doc-typofix' into maint (31efe2a)
   1. "$MERGE_TOOLS_DIR/vimdiff"