Skip to content

Instantly share code, notes, and snippets.

@jan-swiecki

jan-swiecki/bcomp-diff.bat

Last active December 26, 2015 14:18
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save jan-swiecki/7164191 to your computer and use it in GitHub Desktop.
Save jan-swiecki/7164191 to your computer and use it in GitHub Desktop.
Download ZIP
Beyond Compare 3 SVN diff and merge windows batch scripts
Raw
bcomp-diff.bat
@ECHO OFF
REM Source: http://svnbook.red-bean.com/en/1.7/svn.advanced.externaldifftools.html
SET DIFF="bcomp.exe"
SET LEFT=%6
SET RIGHT=%7
%DIFF% %LEFT% %RIGHT%
Raw
bcomp-merge.bat
@ECHO OFF
REM Source: http://svnbook.red-bean.com/en/1.7/svn.advanced.externaldifftools.html
SET DIFF3=BComp.exe
SET BASE=%1
SET THEIRS=%2
SET MINE=%3
SET MERGED=%4
REM left MINE
REM center BASE
REM right THEIRS
%DIFF3% %MINE% %THEIRS% %BASE% %MERGED%
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment