mergetools / gvimdiffon commit Merge branch 'js/add-i-mingw' into maint (fa0963d)
   1. "$MERGE_TOOLS_DIR/vimdiff"