joachim99@75: @ECHO OFF
joachim99@75: 
joachim99@75: REM In file "c:\Documents and Settings\<username>\Application
joachim99@75: REM Data\Subversion\config" you can change that behavior by
joachim99@75: REM modifying "diff3-cmd" line to call KDiff3 instead of
joachim99@75: REM automatic merge. Well, you need a batch file actually (based on
joachim99@75: REM http://svn.collab.net/repos/svn/trunk/contrib/client-side/diff3wrap.bat):
joachim99@75: 
joachim99@75: REM Configure your favorite diff3/merge program here.
joachim99@75: SET DIFF3="C:\Program Files\KDiff3\kdiff3.exe"
joachim99@75: 
joachim99@75: REM Subversion provides the paths we need as the ninth, tenth, and eleventh 
joachim99@75: REM parameters.  But we only have access to nine parameters at a time, so we
joachim99@75: REM shift our nine-parameter window twice to let us get to what we need.
joachim99@75: SHIFT
joachim99@75: SHIFT
joachim99@75: SET MINE=%7
joachim99@75: SET OLDER=%8
joachim99@75: SET YOURS=%9
joachim99@75: 
joachim99@75: REM Call the merge command (change the following line to make sense for
joachim99@75: REM your merge program).
joachim99@75: %DIFF3% %OLDER% %MINE% %YOURS% -o merged.txt
joachim99@75: 
joachim99@75: REM After performing the merge, this script needs to print the contents
joachim99@75: REM of the merged file to stdout.  Do that in whatever way you see fit.
joachim99@75: REM Return an errorcode of 0 on successful merge, 1 if unresolved conflicts
joachim99@75: REM remain in the result.  Any other errorcode will be treated as fatal.
joachim99@75: 
joachim99@75: type merged.txt
joachim99@75: 
joachim99@75: del merged.txt