comparison easyhg-merge.bat @ 272:256138a4ed0e

* Add easyhg-merge.bat and use it. (This isn't necessary if hg has been properly configured, as the Tortoise distribution has)

+@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"
+)