Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib: run editmergeps.ps1 from the same location as editmergeps.bat
authorKostia Balytskyi <ikostia@fb.com>
Tue, 30 May 2017 05:56:48 -0700
changeset 32567 4b9b87930cb3
parent 32566 1b90036f42f0
child 32568 4daf5c18055a
contrib: run editmergeps.ps1 from the same location as editmergeps.bat This change is needed for cases when user does not put editmergeps.bat directly into PATH, but rather uses 'merge-tools.editmergeps.executable' config option to provide a full path to editmergeps.bat. In such cases, editmergeps.ps1 cannot be run simply by name, it needs a full path. In BATCH file %~dp0 stands for the directory in which the original file is located.
contrib/editmergeps.bat file | annotate | diff | comparison | revisions 
--- a/contrib/editmergeps.bat	Sun May 21 16:57:32 2017 +0900
+++ b/contrib/editmergeps.bat	Tue May 30 05:56:48 2017 -0700
@@ -1,2 +1,2 @@
 @echo off
-powershell -NoProfile -ExecutionPolicy unrestricted -Command "& 'editmergeps.ps1' %*"
+powershell -NoProfile -ExecutionPolicy unrestricted -Command "& '%~dp0\editmergeps.ps1' %*"
Mercurial