mergetools / vimdiff2on commit Merge branch 'js/mingw-redirect-std-handles' into maint (74ef465)
   1. "$MERGE_TOOLS_DIR/vimdiff"