Mercurial > hg > easyhg

diff easyhg-merge.bat @ 272:256138a4ed0e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Add easyhg-merge.bat and use it. (This isn't necessary if hg has been properly configured, as the Tortoise distribution has)
author Chris Cannam
date Tue, 25 Jan 2011 16:12:23 +0000
parents
children d2e4bf428cfc
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/easyhg-merge.bat	Tue Jan 25 16:12:23 2011 +0000
@@ -0,0 +1,22 @@
+@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"
+)