beyondcompare

What is the correct parameters to get Beyond Compare 3 working with Eclipse/Subclipse conflict resolution? In Preferences > Team > SVN > Diff/Merge there's the option to specify an external program to resolve conflicts. The default parameters are: "${yours}" "${theirs}" "${base}" "${merged}" And it suggests TortoiseMerge settings of this: /theirs:"${theirs}" /base:"${base}" /mine:"${yours}" /merged:"${merged}" But what is the appropriate config for Beyond Compare? Looks like this is correct: "${theirs}" "${yours}" "${base}" "${merged}" Based on this forum post: http://www.scootersoftware.com

I do have some text sequences that are replaced by the SCM (Perforce in my case). I do want to configure BeyondCompare to consider these sequences as unimportant differences in order to be able to ignore them when I compare files. In my case it's about Python source files and the sequences are looking like # $Id: //depot/.../filename#7 $ # $DateTime: 2010/09/01 10:45:29 $ # $Author: username $ # $Change: 1234 $ Sometimes these sequences can be outside comments, but even in this cases I would like to be able ignore these lines because they are not really changed. Beyond Compare's parser doesn't

I would like to see a specific commit in Beyond Compare or any other separate diff tool while viewing it via git show . I tried looking at help of git show/difftool/config but couldn't find anything. Does anyone know how it can be done? I've looked at Git Diff with Beyond Compare and configured Beyond Compare for git difftool but I also want to use it as tool from git show I managed to use git difftool to see commits that I normally used to see via git show . git show $commit translates to git difftool $commit^ $commit . The above command shows difference between commit's parent ($commit^) and

>>git difftool branch1 branch2 opens my difftool (Beyond Compare:BC) with every file that has a diff between the branches. I have to close BC after each file just for it to reopen with the next file. BC can diff whole directories and multiple files. Is there a way to get git difftool to open all files simultaneously, or diff the whole tree simultaneously? Olivier Refalo Starting with git v1.7.11, you can use git difftool --dir-diff to perform a directory diff. The answer that follows applies to git installations older than v1.7.11. This issue is not related to BC, but to the way git works.

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

I would like to use Beyond Compare inside Eclipse. The problem at hand is, that the native diff and merge tool does not allow to customize the diff enough, so there are too much differences. Beyond Compare has the right customization for that, but I could not integrate the tool. I have tried the following: Use the Eclipse Plugin http://beyondcvs.sourceforge.net/ But I could not configure Subversive inside Eclipse to use that plugin, and the plugin does not integrate itself into the merge action of Subversive. Tried to integrate Beyond Compare as the diff viewer (see Eclipse Window >

in windows I am able to use winmerge as the external diff tool for hg using mercurial.ini ,etc. Using some options switch that you can find in web(I think it's a japanese website) Anyway, here for example: hg winmerge -r1 -r2 will list file(s) change(s) between rev1 and rev2 in winmerge. I can just click which file to diff but for bc3: hg bcomp -r1 -r2 will make bc3 open a dialog which stated that a temp dir can't be found. The most I can do using bc3 and hg is hg bcomp -r1 -r2 myfile.cpp which will open diff between rev1 and rev2 of myfile.cpp So,it seems that hg+bc3 can't successfully

I would like to integrate Beyond Compare with ClearCase so that I can use it for diffing and merging files, instead of the awful tools provided by ClearCase. Does anyone have instructions for performing this integration? VonC As mentioned in my previous answer , just modify the map file located in: # up to ClearCase 7.0 c:\program files\rational\ClearCase\lib\mgrs or # ClearCase 7.1 and more c:\program files\IBM\RationalSDLC\ClearCase\lib\mgrs Each map line has 3 parts: the CC filetype, the CC action, and the application. In your case, find the section in the map file for text_file_delta file