beyondcompare

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

Originally the question was "How do I configure WinMerge as the compare and merge tool for TFS". However, I am changing it because TehOne answered this more general form of the question. I would have though this would have been asked already on Stackoverflow. I found the answer elsewhere, but I am asking/answering here. It's now a community wiki. When I was looking for how to do this, I found this post to be invaluable: http://blogs.msdn.com/jmanning/articles/535573.aspx The long procedure is provided in a Rory Primrose blog posting The short answer is the argument list for compare is: /x /e

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

I have succeeded in getting git to start Beyond Compare 3 as a diff tool however, when I do a diff, the file I am comparing against is not being loaded. Only the latest version of the file is loaded and nothing else, so there is nothing in the right pane of Beyond Compare. I am running git 1.6.3.1 with Cygwin with Beyond Compare 3. I have set up beyond compare as they suggest in the support part of their website with a script like such: #!/bin/sh # diff is called by git with 7 parameters: # path old-file old-hex old-mode new-file new-hex new-mode "path_to_bc3_executable" "$2" "$5" | cat Has

This question already has an answer here: Directory comparison of Git branches 3 answers Is it possible to get the git difftool command to open a directory compare between the changed files and the staging/checked files? So ideally, if 2 files have changed, they would be the only 2 shown, but within a directory compare. I've read posts about getting git to give all file diffs in parallel, so tools like BeyondCompare has all the diffs in tabs , but im not happy with that! One could pull a copy of the changed files from staging/checked in files into a temp folder, and then open that up. Is that

I would like to configure Visual Studio to open Beyond Compare by default as the diff tool. How can I do this? In Visual Studio, go to the Tools menu, select Options , expand Source Control , (In a TFS environment, click Visual Studio Team Foundation Server), and click on the Configure User Tools button. Click the Add button. Enter/select the following options for Compare: Extension : .* Operation : Compare Command : C:\Program Files\Beyond Compare 3\BComp.exe (replace with the proper path for your machine, including version number) Arguments : %1 %2 /title1=%6 /title2=%7 If using Beyond