beyondcompare3

I saw this posting which explained how to get BC3 working as the diff tool for Subversion... but what about using Beyond Compare 3 to do 3-way merge/compares? To do this, create a batch file called (for example) diff3wrap.bat, and setup your diff3-cmd in your SVN config to point at it. The following diff3wrap.bat file will do the job. It creates a temporary filename for the merge output and deletes it after returning the merged contents back to SVN. @ECHO OFF SET DIFF3="C:\Program Files\BeyondCompare3\BComp.exe" REM Subversion provides the paths we need as the last three parameters REM These

How to configure Visual Studio to use Beyond Compare has a great answer for how to configure Visual Studio to use Beyond Compare. However, the UI for these steps has changed in Visual Studio 2013. Part of this may be due to the fact that I'm using Git for my SCM, and VS 2013 now has native Git support. Has anyone figured out how to configure VS 2013 to use Beyond Compare? Kent Fehribach At least for VS 2012 you can actually just update from the command prompt as shown on the Scooter website. http://www.scootersoftware.com/support.php?zz=kb_vcs#gitwindows If you've installed msysgitVS using the

There is clear explanation how to make BC a default tool for diff and merging for Subversion and Git when used not from within Eclipse. But what about the latter? I keep getting the following dialog: UPDATE: Added to my global .gitconfig and git difftool command now works. Can't say the same about Eclipse. I can't get why it's so confusing to set up. [diff] tool = bc3 [difftool] prompt = false [difftool "bc3"] cmd = \"C:/Program Files (x86)/Beyond Compare 3/BComp.exe\" "$LOCAL" "$REMOTE" My Eclipse config now looks like: VonC This thread suggests: tinkering the the git config Eclipse

One of my favorite workflows with svn is to use Beyond Compare's folder comparison feature to see the net differences between two branches, or a branch and the trunk. Is there a way to do this in git without having to manually create multiple clones of the same repository? As I ask this question, it occurs to me that I could write a script that would clone the current repo to a temporary directory, checkout the desired branch, and then call BCompare.exe with the two directories as arguments. The folder comparison view is invoked with BCompare.exe path/to/folder1 path/to/folder2 Does this sound

I use Beyond Compare (version 3.1.10) to compare different versions of Delphi Form Files, but I don't want to see differences concerning ExplicitTop, ExplicitLeft, ExplicitHeight and ExplicitWidth. Details: These lines will always begin with a number of whitespace characters, then "ExplicitXXX = " and a number. Older versions of Delphi didn't have these lines, so I want to ignore differences where these lines are added to the newest version, and I also want to ignore differences where the number has changed. Does anyone know how to do this? Edit: Duplicate (more or less) of: How do I configure