mergetools / gvimdiff2on commit Merge branch 'js/mingw-isatty' into maint (0ab8606)
   1. "$MERGE_TOOLS_DIR/vimdiff"