@ECHO OFF

REM Configure your favorite diff3/merge program here.
SET DIFF3="C:\Program Files\Funky Stuff\My Merge Tool.exe"

SET MINE=%9
SHIFT
SET OLDER=%9
SHIFT
SET YOURS=%9

REM Call the merge command (change the following line to make sense)
%DIFF3% --older %OLDER% --mine %MINE% --yours %YOURS%

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.


@ECHO OFF

REM Configure your favorite diff3/merge program here.
SET DIFF3="C:\Program Files\Funky Stuff\My Merge Tool.exe"

REM We only have access to nine parameters at a time.  We use SHIFT to slide
REM our nine-parameter window a little bit so we can get to what we need.
SET MINE=%9
SHIFT
SET OLDER=%9
SHIFT
SET YOURS=%9

REM Call the merge command (change the following line to make sense)
%DIFF3% --older %OLDER% --mine %MINE% --yours %YOURS%

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.


Add a helpful comment for folks unfamiliar with the SHIFT construct.
Add a helpful comment for folks unfamiliar with the SHIFT construct.

* contrib/client-side/diff3wrap.bat

git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@855345 13f79535-47bb-0310-9956-ffa450edef68
