| @ECHO OFF | |
| REM Configure your favorite diff program here. | |
| SET DIFF="C:\Program Files\Funky Stuff\My Diff Tool.exe" | |
| REM Subversion provides the paths we need as the sixth and seventh | |
| REM parameters. | |
| SET LEFT=%6 | |
| SET RIGHT=%7 | |
| REM Call the diff command (change the following line to make sense for | |
| REM your merge program). | |
| %DIFF% --left %LEFT% --right %RIGHT% | |
| REM Return an errorcode of 0 if no differences were detected, 1 if some were. | |
| REM Any other errorcode will be treated as fatal. |