mergetools / vimdiff2on commit Merge branch 'js/mingw-isatty' into maint (6a7e25d)
   1. "$MERGE_TOOLS_DIR/vimdiff"