Mercurial > hg > easyhg
view easyhg-merge.bat @ 484:896b7903e8f2
Make "Show all files" persistent (fixing #203), and rationalise some config group names (noting that "General" is actually the default group "" as it appears in the config file, not the name of a group called "General": that appears as "%General")
author | Chris Cannam |
---|---|
date | Wed, 17 Aug 2011 16:09:04 +0100 |
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)" )