mergetools / gvimdiffon commit Merge branch 'va/mailinfo-doc-typofix' (5bfc50d)
   1. "$MERGE_TOOLS_DIR/vimdiff"