view easyhg-merge.bat @ 532:06507a59f2b8 easyhg_v1.1

This will do for the Merge topic
author Chris Cannam
date Wed, 23 Nov 2011 17:24:47 +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)"
)