Windows package and the diff tool (suggestion)

[Shun-ichi GOTO]

On 11/15/06, Marcos Chaves <marcos.nospam at gmail.com> wrote:
> Also, if this is useful to anyone, here's how my 'hgmerge.cmd' file
> looks like. I decided to use TortoiseMerge as my merge tool because I
> already had it installed, and also both kdiff3 and GNU diff3 were
> messing the EOL of my files:
>
> "C:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe" /mine:%1 /base:%2
> /theirs:%3 /merged:%1

Btw, I introduce my merge script using on windows.
This script requires standard merge.exe, and TortoiseMerge.exe
Try merge command first, then execute TortoiseMerge only if conflicted.

-----from-here-----
rem This is wrapper of TortoseMerge for mercurial.
rem
rem usage: tmerge local base other
rem
rem Environment variables set by Mercurial:
rem HG_FILE            name of file within repo
rem HG_MY_NODE         revision being merged
rem HG_OTHER_NODE      revision being merged

setlocal

rem Select program from: merge TortoiseMerge
set PROG=merge
rem set PROG=TortoiseMerge

set LOCAL=%1
set BASE=%2
set OTHER=%3

if %PROG%. == TortoiseMerge. goto TORTOISE_MERGE
if %PROG%. == merge. goto MERGE

:TORTOISE_MERGE
set PROG="C:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe"
%PROG% /base:%BASE% /theirs:%OTHER% /mine:%LOCAL% /merged:%HG_FILE%
goto QUIT

:MERGE
set TMPF=%HG_FILE%.merged
merge -p "%LOCAL%" "%BASE%" "%OTHER%" >%TMPF%
if errorlevel 1 goto TORTOISE_MERGE
mv %TMPF% %LOCAL%
goto QUIT

:QUIT
endlocal
-----until-here-----

-- 
Shun-ichi GOTO