diff -r 531e6a57abd2 -r 799615bbf5bf contrib/editmergeps.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/editmergeps.bat Thu May 18 14:36:46 2017 -0700 @@ -0,0 +1,2 @@ +@echo off +powershell -NoProfile -ExecutionPolicy unrestricted -Command "& 'editmergeps.ps1' %*"