comparison tests/test-largefiles.t @ 32567:4b9b87930cb3

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 1b27e1793156
children b6776b34e44e
comparison
equal deleted inserted replaced
32566:1b90036f42f0 32567:4b9b87930cb3