comparison contrib/editmergeps.ps1 @ 32569:04e18be6e188

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.

32568:4daf5c18055a

    Write-Output "firstline is: $firstline, previousline is: $previousline"
  }
}
else
{
  $ "$ed" $file
}

$conflicts=Get-Lines
if ($conflicts.Length -ne 0)
{

32569:04e18be6e188

    Write-Output "firstline is: $firstline, previousline is: $previousline"
  }
}
else
{
  & "$ed" $file
}

$conflicts=Get-Lines
if ($conflicts.Length -ne 0)
{