mergetools / gvimdiffon commit Merge branch 'mi/typofixes' into maint (a4a227a)
   1. "$MERGE_TOOLS_DIR/vimdiff"