Mercurial > hg

comparison contrib/editmergeps.bat @ 32567:4b9b87930cb3

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 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.
author Kostia Balytskyi <ikostia@fb.com>
date Tue, 30 May 2017 05:56:48 -0700
parents 799615bbf5bf
children
comparison
equal deleted inserted replaced
32566:1b90036f42f0 32567:4b9b87930cb3
1 @echo off 1 @echo off
2 powershell -NoProfile -ExecutionPolicy unrestricted -Command "& 'editmergeps.ps1' %*" 2 powershell -NoProfile -ExecutionPolicy unrestricted -Command "& '%~dp0\editmergeps.ps1' %*"