Mercurial > public > mercurial-scm > hg-stable

diff contrib/editmergeps.ps1 @ 32602:04e18be6e188

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Kostia Balytskyi <ikostia@fb.com>
date Tue, 30 May 2017 06:17:51 -0700
parents 4daf5c18055a
children 92bcaef3420b
line wrap: on
line diff
--- 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