mergetools / gvimdiffon commit Merge branch 'ab/doc-misc-typofixes' (04116ec)
   1. "$MERGE_TOOLS_DIR/vimdiff"