# HG changeset patch # User Kostia Balytskyi # Date 1496150271 25200 # Node ID 04e18be6e188468aae870308baa6f67e82d0070c # Parent 4daf5c18055adc4efe0734bc4a90e2432aec17b4 contrib: fix a bug preventing editmergeps.ps1 from running unknonw editors '$ executable' is not a way to run executable in powershell, '& executable' is instead. Found this when testing with regular Windows notepad. diff -r 4daf5c18055a -r 04e18be6e188 contrib/editmergeps.ps1 --- a/contrib/editmergeps.ps1 Tue May 30 06:02:31 2017 -0700 +++ b/contrib/editmergeps.ps1 Tue May 30 06:17:51 2017 -0700 @@ -65,7 +65,7 @@ } else { - $ "$ed" $file + & "$ed" $file } $conflicts=Get-Lines