Mercurial > hg > easyhg
view easyhg-merge.bat @ 716:6fb20633da00
Defeat cacheing; switch to 16.04 for deb build (no point in trying to support 14.04 as it doesn't have the python-pyqt5 package that is one of our dependencies)
author | Chris Cannam |
---|---|
date | Wed, 12 Dec 2018 14:10:55 +0000 |
parents | d2e4bf428cfc |
children |
line wrap: on
line source
@echo off setlocal enableextensions setlocal enabledelayedexpansion set mypath=%~dp0 set kdiff=kdiff3.exe set found= set SEARCH=%mypath%;%PATH% :loop for /F "delims=; tokens=1*" %%e in ("%SEARCH%") do ( if exist "%%e\%kdiff%" ( set found=%%e\%kdiff% goto done; ) set SEARCH=%%f ) if not "%SEARCH%"=="" goto loop; :done if "%found%"=="" ( echo. "Failed to find kdiff.exe in path" ) else ( "%found%" "%~2" "%~1" "%~3" -o "%~1" --auto -L1 "%~1 (Common ancestor)" -L2 "%~1 (Your current version)" -L3 "%~1 (Version being merged)" )