[helpers]
# diff-cmd = diff_program (diff, gdiff, etc.)
diff-cmd = F:\Tools\Peter script\diffwrap.bat
# diff3-cmd = diff3_program (diff3, gdiff3, etc.)
diff3-cmd = F:\Tools\Peter script\diff3wrap.bat

@ECHO OFF
REM Configure your favorite diff3/merge program here.
SET DIFF3="bcompare"
REM Subversion provides the paths we need as the last three parameters.
REM These are parameters 9, 10, and 11. But we have access to only
REM nine parameters at a time, so we shift our nine-parameter window
REM twice to let us get to what we need.
SHIFT
SHIFT

echo cd: %cd% >> C:\log\svn.log
echo 0: %0 >> C:\log\svn.log
echo 1: %1 >> C:\log\svn.log
echo 2: %2 >> C:\log\svn.log
echo 3: %3 >> C:\log\svn.log
echo 4: %4 >> C:\log\svn.log
echo 5: %5 >> C:\log\svn.log
echo 6: %6 >> C:\log\svn.log
echo 7: %7 >> C:\log\svn.log
echo 8: %8 >> C:\log\svn.log
echo 9: %9 >> C:\log\svn.log
echo ========================== >> C:\log\svn.log
rem %2 %3 %1 %4

SET MINE=%7
SET OLDER=%8
SET YOURS=%9
REM Call the merge command (change the following line to make sense for
REM your merge program).
%DIFF3% --older %OLDER% --mine %MINE% --yours %YOURS% /title1=old /title2=mine /title3=local
rem %DIFF3% %1 %2 %3 %4 /title1=%6 /title2=%7 /title3=%8 /title4=%9
REM After performing the merge, this script needs to print the contents
REM of the merged file to stdout. Do that in whatever way you see fit.
REM Return an errorcode of 0 on successful merge, 1 if unresolved conflicts
REM remain in the result. Any other errorcode will be treated as fatal.

cd: G:\YH\codes\branch\v5.6\src\g5 
0: -m 
1: -L 
2: .mine 
3: -L 
4: .r27833 
5: -L 
6: .r27869 
7: G:\YH\codes\.svn\tmp\svn-4C77CBE4 
8: G:\YH\codes\.svn\pristine\58\587d96b99363d2088f68761624eef706718a2624.svn-base 
9: G:\YH\codes\.svn\pristine\c0\c028fdf78c4962826d834f5c7bc2ab480e1357ed.svn-base ==========================