# HG changeset patch
# User Kostia Balytskyi <ikostia@fb.com>
# Date 2017-05-30 12:56:48
# Node ID 4b9b87930cb3ba73d2e396113de8511347117a69
# Parent  1b90036f42f09e8d3962dcf6e69a74101f67d407

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.

diff --git a/contrib/editmergeps.bat b/contrib/editmergeps.bat
--- a/contrib/editmergeps.bat
+++ b/contrib/editmergeps.bat
@@ -1,2 +1,2 @@
 @echo off
-powershell -NoProfile -ExecutionPolicy unrestricted -Command "& 'editmergeps.ps1' %*"
+powershell -NoProfile -ExecutionPolicy unrestricted -Command "& '%~dp0\editmergeps.ps1' %*"