Mercurial > hg > easyhg
view easyhg-merge.bat @ 633:db62a0cb3037
* Added setting to specify that diff command should be run once for each selected file, rather than passing all file names to diff command (p4merge doesn't like being given many files)
author | Sam Izzo <sam@humbug.net> |
---|---|
date | Mon, 27 Aug 2012 01:26:57 +1000 |
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)" )