Using Beyond Compare with Version Control Systems

//z 2013-08-06 17:11:05 IS2120@BG57IV3.T979209553 .K[T4,L349,R3,V36]
注意用以版本比较时，都是使用的 bcomp.exe（其存在的目的就是专为完成此事）
而不是BCompare.exe

//z 2013-07-23 17:03:49 IS2120@BG57IV3.T596097240 .K[T43,L2692,R15,V1089]
Beyond Compare can be configured as the external difference utility in many popular VCS applications.  The following are configuration instructions for specific products.  Let us know if you have one to add to the list.

Unless otherwise specified, all examples are based on 

 Beyond Compare v3.

 Beyond Compare v2 users should replace BComp.exe with BC2.exe

 Linux64-bit Windows users should replace "c:\program files" with "c:\program files (x86)".

Index://z 2013-07-23 17:03:49 IS2120@BG57IV3.T596097240 .K[T43,L2692,R15,V1089]
AccuRev  AnkhSVN  CA Software Change Manager  ClearCase  ClearCase Remote Client  Code Co-op CS-RCS  CVS  Dimensions CM / PVCS / Serena  Eclipse IDE  FreeVCS  Git for Linux  Git for Windows KDESVN  Mercurial / HG / TortoiseHg  MKS Integrity  NetBeans  Perforce  Plastic SCM  QVCS Rational Synergy  RoboHelp HTML  Roundtable TSMS  SourceAnyWhere for VSS SourceGear Vault / Fortress  SourceOffSite  StarTeam  Subversion  Surround SCM  Team Coherence Team Foundation Server (TFS)  Telelogic Synergy  TortoiseCVS  TortoiseGit  TortoiseSVN VersionMaster  Visual SourceSafe 2005  Visual Studio 2005 with Visual SourceSafe 2005  WinCVS


ACCUREV

Windows

  1. Preferences from the Tools
  2. Diff/Merge
  3. Diff: overwrite the preset with:  

"C:\Program Files\Beyond Compare 3\bcomp.exe" %1% %2% /lefttitle="%3%" /righttitle="%4%"

  1. Merge (v3 Pro): overwrite the preset with:  

"C:\Program Files\Beyond Compare 3\bcomp.exe" %1% %2% %a% /mergeoutput=%o% /lefttitle="%4%" /righttitle="%5%" /centertitle="%3%"

Linux

  1. Preferences from the Tools
  2. Diff/Merge
  3. Diff: overwrite the preset with:  

/usr/bin/bcompare %1% %2% -lefttitle="%3%" -righttitle="%4%"

  1. Merge (v3 Pro): overwrite the preset with:  

/usr/bin/bcompare %1% %2% %a% -mergeoutput=%o% -lefttitle="%4%" -righttitle="%5%" -centertitle="%3%"


ANKHSVN

  1. Open Visual Studio.
  2. Options from the Tools
  3. Source Control | Subversion User Tools.
  4. For the Diff and Merge entries, select Beyond Compare from the dropdown.


CA SOFTWARE CHANGE MANAGER

  1. Open the Workbench.
  2. Options from the Tools
  3. Merge Tool
  4. ToolName
  5. Compare, 2-way Merge, and 3-way Mergefields.

Compare

  BComp.exe /readonly $(File1) $(File2)2-way Merge

  BComp.exe $(TrunkFile) $(BranchFile) /mergeoutput=$(ResultsFile)3-way Merge (v3 Pro)

  BComp.exe $(TrunkFile) $(BranchFile) $(AncestorFile) $(ResultsFile)

CLEARCASE

  1. Go into the "C:\Program Files\Rational\ClearCase\lib\mgrs" folder.
  2. Create a backup of the file named "map".
  3. Edit "map" and edit the following lines to point to Beyond Compare:

text_file_delta compare C:\Program Files\Beyond Compare 3\BComp.exe
text_file_delta xcompare C:\Program Files\Beyond Compare 3\BComp.exe
text_file_delta merge C:\Program Files\Beyond Compare 3\BComp.exe
text_file_delta xmerge C:\Program Files\Beyond Compare 3\BComp.exe_html, _xml, _html2, _xml2Beyond Compare 2, only change the xcompare line of the map file.  Overriding compare, merge, and xmerge is not supported.  A helper that improves BC2's support is available here.

CLEARCASE REMOTE CLIENT

C:\Program Files\IBM\Rational\ClearCase701\CCRC\plugins\com.ibm.rational.clearcase.compare_merge.win32.x86_7.0.1.D061004C:\Program Files\IBM\IMShared\plugins\com.ibm.rational.clearcase.compare_merge.win32.x86_7.1.1.v201007070751

  • Note that the version number in path is subject to change.
  1. Copy "C:\Program Files\Beyond Compare 3\bcomp.exe" into the folder.
  2. Move ccrc_cleardiff.exe, ccrc_cleardiffmrg.exe, ccrc_worddiffmrg.exe and ccrc_xmldiffmrg.exe to a backup folder.
  3. Make 4 copies of bcomp.exe and rename them to ccrc_cleardiff.exe, ccrc_cleardiffmrg.exe, ccrc_worddiffmrg.exe and ccrc_xmldiffmrg.exe.
  4. Preferences | CCRC |Integration | Compare_Merge.


CODE CO-OP

Visit Reliable Software for details on using Beyond Compare with Code Co-op.  Reliable Software offers a discounted bundle of the two products.


CS-RCS

  1. Settings from the Document Explorer's Project
  2. File Types
  3. Default
  4. Difference Analysis Tool
  5. Difference Analysis Tool


CVS

CVS does not support external diff or merge tools.


DIMENSIONS CM / PVCS / SERENA


 BC version 3:pvcsmerge.exe

  1.  and rename it to

pvcsmerge.exe.exe

  1. .

bcomp.exe

  1.  from 

C:\Program Files\Beyond Compare 3

  1.  into the Dimensions folder and rename it to 

pvcsmerge.exe

  1. .

native.properties

 BC version 3 with extended functionality:

Download PVCSmerge.zip and follow the PVCSmerge.txt instructions included in the zip file.  Tested with PVCS 6.8 and 8.0 as well as Dimensions 8, 9 and 10.

Adds support for comparison of binary files (e.g. Word documents) and archives (Zip).


 BC version 2:BComp.exe use the copy of pvcsmerge.exe inpvcsmergev8.zip for PVCS 6.8, 8.0, and Merant Dimensions 8, or in pvcsmerge75.zip for PVCS 7.5.

ECLIPSE IDE

Launch Beyond Compare from the Eclipse IDE using the Beyond CVS plug-in by Chris Callandar and Nick Boldt.


FREEVCS

  1. Properties in the Project Manager's Options
  2. Compare Tools
  3. Add Custom
  4. Enter "Beyond Compare" as the new name.
  5. Edit
  6. File compare utility
  7. Command line parameter string


GIT FOR LINUX

For Git 1.7.8 and newer, edit the global config file to set:

Diff

  1. Create a shell script file "git-diff-wrapper.sh" with the following content:

  #!/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

  1. In a console window enter the command:

  $ git config --global diff.tool bc3
  $ git config --global difftool.bc3.cmd <path_to_wrapper_script>

Merge

Add the Beyond Compare 3 directory to the Windows PATH variable.  Then:


  git config --global merge.tool bc3
  git config --global mergetool.bc3 trustExitCode true

For Older versions of Git

Diff

  1. Create a shell script file "git-diff-wrapper.sh" with the following content:

  #!/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

  1. In a console window enter the command:

  $ git config --global diff.external <path_to_wrapper_script>

3-way Merge

In a console window enter the following three commands:


  $ git config --global merge.tool bc3
  $ git config --global mergetool.bc3.cmd "/usr/bin/bcompare \$LOCAL
    \$REMOTE \$BASE \$MERGED"
  $ git config --global mergetool.bc3.trustExitCode true

2-way Merge

In a console window enter the following three commands:


  $ git config --global merge.tool bc3
  $ git config --global mergetool.bc3.cmd "/usr/bin/bcompare \$LOCAL
    \$REMOTE -savetarget=\$MERGED"
  $ git config --global mergetool.bc3.trustExitCode true

Optional Resources

GIT-DIFALL

  • Custom directory based diff mechanism for git.
    Requires install and addition of git-difall to your path.


GIT FOR WINDOWS

$ character with \.

For Git 1.7.6 and newer, edit the global config file to set the path:

Diff

At a Windows command prompt enter the commands:


  git config --global diff.tool bc3
  git config --global difftool.bc3.path "c:/program files/beyond compare 3/bcomp.exe"

To launch a diff with BC3, use the command "git difftool foofile.txt".

3-way Merge

At a Windows command prompt, enter the commands:


  git config --global merge.tool bc3
  git config --global mergetool.bc3.path "c:/program files/beyond compare 3/bcomp.exe"

To launch a 3-way merge with BC3, use the command "git mergetool foofile.txt".

Older versions of Git are configured with a different override for cmd:

Diff

At a Windows command prompt enter the commands:


  git config --global diff.tool bc3
  git config --global difftool.bc3.cmd "\"c:/program files/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\""
  git config --global difftool.prompt false

To launch a diff with BC3, use the command "git difftool foofile.txt".

3-way Merge

At a Windows command prompt, enter the commands:


  git config --global merge.tool bc3
  git config --global mergetool.bc3.cmd "\"c:/program files/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
  git config --global mergetool.bc3.trustExitCode true

To launch a 3-way merge with BC3, use the command "git mergetool foofile.txt".


KDESVN

  1. Configure KDESVN from the Settings
  2. Diff & Merge.
  3. Use external diff display.
  4. External diff display edit, use:

bcompare -readonly %1 %2

  1. External merge program edit, use:

bcompare %s1 %s2 %t

  1. External resolver program edit, use:

bcompare %n %m %o %t


MERCURIAL / HG / TORTOISEHG

Tortoise Hg 2.0.2 and newer can be configured using the graphical interface:

Diff

  1. Launch TortoiseHG Workbench.
  2. File menu go to Settings.
  3. TortoiseHg.
  4. Visual Diff Tool to beyondcompare3

3-way Merge

  1. Launch TortoiseHG Workbench.
  2. File menu go to Settings.
  3. TortoiseHg
  4. Three-way Merge Tool to beyondcompare3

%USERPROFILE%\Mercurial.ini or $HOME/.hgrc.  Add the following lines, using existing INI sections if they already exist:

Diff

  [extensions]
  extdiff =
  
  [extdiff]
  cmd.bcomp = C:\Program Files\Beyond Compare 3\BComp.exe
  opts.bcomp = /ro
  
  [tortoisehg]
  vdiff = bcomp

Once set up you can compare revisions from the command line using

hg bcomp -r <rev1> [-r <rev2>] [<filename>]

3-way Merge

  [merge-tools]
  bcomp.executable = C:\Program Files\Beyond Compare 3\BComp.exe
  bcomp.args = $local $other $base $output
  bcomp.priority = 1
  bcomp.premerge = True
  bcomp.gui = True
  
  [ui]
  merge = bcomp

MKS INTEGRITY

Diff

  1. Start MKS Source Integrity.
  2. Tools | Preferences | DiffTool.
  3. Custom Command.
  4. Enter the command:
      

"C:\Program Files\Beyond Compare 3\BComp.exe" /title1="{1}" /title2="{2}" "{3}" "{4}"

3-way Merge

Use this for the merge tool command line:

  "C:\Program Files\Beyond Compare 3\BComp.exe" /title1="{1}" /title2="{2}" /title3="{0}" "{5}" "{6}" "{4}" "{7}"

2-way Merge

Use this for the merge tool command line:

  "C:\Program Files\Beyond Compare 3\BComp.exe" /title1="{1}" /title2="{2}" "{5}" "{6}" /savetarget="{7}"

NETBEANS

  1. Options from the Tools
  2. Miscellaneous.
  3. Diff
  4. External Diff.

C:\Program Files\Beyond Compare 3\BComp.exe {0} {1}

Team | Local History | Show Local History


PERFORCE

P4V  (The Perforce Visual Client)

  1. Preferences from the Edit
  2. Diff
  3. Default Diff Application
  4. Location
  5. Merge
  6. Default merge application
  7. Location
  8. Arguments edit, enter:
      

%1 %2 %b %r

P4Win  (The Perforce Windows Client)

  1. Options from the Settings
  2. Files > Diff.
  3. User supplied diff application.
  4. Browse to BComp.exe.
  5. Options args and enter:
     

/lefttitle="%L" /righttitle="%R" %1 %2

  1. Files > Merge.
  2. User supplied merge application.
  3. Browse to BComp.exe.
  4. Optional args and enter:
     

/vcsleft="%T" /vcsright="%Y" %2 %3 %1 %4

P4  (The Perforce Command Line Client)

  1. Add two environmental variables:
     

P4DIFF=C:\Program Files\Beyond Compare 3\BComp.exe

  1.  

P4MERGE=C:\Program Files\Beyond Compare 3\BCompP4Merge.bat

  1. BCompP4Merge.bat in your Beyond Compare install folder with the contents:  

"C:\Program Files\Beyond Compare 3\BComp" %2 %3 %1 %4


PLASTIC SCM

Diff

  1. Diff tools from the Preferences
  2. $text, choose Edit.
  3. Add the command line:

"C:\Program Files\Beyond Compare 3\BComp.exe" "@sourcefile" "@destinationfile" /lefttitle="@sourcesymbolic" /righttitle="@destinationsymbolic"

Merge

  1. Merge tools from the Preferences
  2. $text, choose Edit.
  3. Add the command line:

"C:\Program Files\Beyond Compare 3\BComp.exe" /title1="@sourcesymbolic" /title2="@basesymbolic" /title3="@destinationsymbolic" "@sourcefile" "@destinationfile" "@basefile" "@output"


QVCS

  1. Preferences from the Admin
  2. Utilities
  3. Visual Compare Utility Command Line edit, enter:
      

C:\Progra~1\Beyond~1\BComp.exe file1Name file2Name


RATIONAL SYNERGY

Java Client, Diff

c:\program files\beyond compare 3\bc3_comp.bat"c:\program files\beyond compare 3\BComp.exe" %1 %2 /lefttitle=%3 /righttitle=%4

  1. Backup the file "C:\Program Files\IBM\Rational\Synergy\7.1\etc\ccm.properties".

windows.tool.compare.ascii = "c:\program files\beyond compare 3\bc3_comp.bat" "%file1" "%file2" "%file1_label" "%file2_label"

Java Client, 3-way Merge

c:\program files\beyond compare 3\bc3_merge.bat"c:\program files\beyond compare 3\BComp.exe" %1 %2 %3 %4 /lefttitle=%5 /righttitle=%6 /centertitle=%7 /outputtitle=%4

  1. Backup the file "C:\Program Files\IBM\Rational\Synergy\7.1\etc\ccm.properties".

windows.tool.merge.ascii = "c:\program files\beyond compare 3\bc3_merge.bat" "%file1" "%file2" "%ancestor" "%outfile" "%file1_label" "%file2_label" "%ancestor_label"

We have reports that some versions of the Java client require double slash characters in the file path.  For example:  

windows.tool.compare.ascii = "C:\\Program Files (x86)\\Beyond Compare 3\\bc3_comp.bat" "%file1" "%file2" "%file1_label" "%file2_label"


Classic Client, Diff

  1. Close the Synergy application.

c:\program files\beyond compare 3\bc3_comp.bat"c:\program files\beyond compare 3\BComp.exe" %1 %2 /lefttitle=%3 /righttitle=%4

  1. Navigate into your %userprofile% directory (type %userprofile% in explorer address bar if you are unsure where this is).
  2. Backup the file named "ccm.ini".

compare_cmd = "c:\program files\beyond compare 3\bc3_comp.bat" "%file1" "%file2" "%file1_label" "%file2_label"

Classic Client, 3-way Merge

  1. Close the Synergy application.

c:\program files\beyond compare 3\bc3_merge.bat"c:\program files\beyond compare 3\BComp.exe" %1 %2 %3 %4 /lefttitle=%5 /righttitle=%6 /centertitle=%7 /outputtitle=%4

  1. Navigate into your %userprofile% directory (type %userprofile% in explorer address bar if you are unsure where this is).
  2. Backup the file named "ccm.ini".

merge_cmd = "c:\program files\beyond compare 3\bc3_merge.bat" "%file1" "%file2" "%ancestor" "%outfile" "%file1_label" "%file2_label" "%ancestor_label"


ROBOHELP

Adobe RoboHelp can be configured to interact with a Version Control System and allows an External Diff tool to be defined.  To define BC3 as the difftool:

  1. Launch RoboHelp HTML.
  2. Tools | Options.
  3. Version Control
  4. SharePoint Settings area, set Path to:
      

C:\Program Files (x86)\Beyond Compare 3\BComp.exe

  1. Arguments, enter:
      

%1 %2

  1. Set the sub-options as appropriate for your VCS environment.


ROUNDTABLE TSMS

  1. Go into the "C:\Program Files\RoundTable\rtb\p" folder.
  2. Create a backup of the file named "Rtb_vcom.p".
  3. Edit "Rtb_vcom.p" and change the line:
      

ASSIGN Mexe = SEARCH("visdiff/visdiff.exe").

  1. to:
      

ASSIGN Mexe = SEARCH("C:\Progra~1\Beyond~1\bcomp.exe").


SOURCEANYWHERE FOR VSS

  1. Tools | Options.  Go to the External Programs
  2. Application for diff/merge:
     

C:\Program Files\Beyond Compare 3\bcomp.exe

  1. Arguments for diff files:
     

/readonly /title1="%FIRST_LABEL%" /title2="%SECOND_LABEL%" "%FIRST_FILE%" "%SECOND_FILE%"

  1. Arguments for diff folders:
     

"%FIRST_DIR%" "%SECOND_DIR%"

  1. Arguments for Two-way merge:
     

/leftreadonly /title1="%FIRST_LABEL%" /title2="%SECOND_LABEL%" "%FIRST_FILE%" "%SECOND_FILE%"

Linux

  1. In some versions of the Linux application, it may be necessary to define the path to bcompare with the arguments.
  2. Application for diff/merge:
     

/usr/bin/bcompare

  1. Arguments for diff files:
     

/usr/bin/bcompare -readonly "%FIRST_FILE%" "%SECOND_FILE%"

  1. Arguments for diff folders:
     

/usr/bin/bcompare "%FIRST_DIR%" "%SECOND_DIR%"


SOURCEGEAR VAULT / FORTRESS

Diff

  1. Options from the Tools
  2. Diff / Merge.
  3. Program
  4. Arguments edit, enter:

"%LEFT_PATH%" "%RIGHT_PATH%" /ro /title1="%LEFT_LABEL%" /title2="%RIGHT_LABEL%"

3-way Merge

  1. Options from the Tools
  2. Diff / Merge.
  3. Program
  4. Arguments edit, enter:

"%WORKING_PATH%" "%OTHER_PATH%" "%BASELINE_PATH%" "%DEST_PATH%" /title1="%WORKING_LABEL%" /title2="%OTHER_LABEL%" /title4="%DEST_LABEL%"

2-way Merge

Use the same steps as above, but set the  Arguments  setting to:


"%WORKING_PATH%" "%OTHER_PATH%" /title1="%WORKING_LABEL%" /title2="%OTHER_LABEL%" /savetarget="%DEST_PATH%"

SOURCEOFFSITE

  1. Options from the Windows Client's Tools
  2. External Programs
  3. Application for comparing files, Application for comparing folders and Application for merging files

Beyond Compare 1.9 is the default external difference utility in SourceOffSite Collaborative Edition.  To upgrade to Beyond Compare 3 follow the instructions above.


STARTEAM

Diff

  1. Personal Options from the Tools
  2. Files
  3. If it's present, click the "Alternate Applications" button.
  4. Comparison Utility
  5. Enter the path to BComp.exe in the edit.
  6. Options edit enter:
     

$file1 $file2

3-way Merge

  1. Merge Utility
  2. Options edit enter:
     

$usertip $branchtip $basefile $resultfile

2-way Merge


SUBVERSION

Windows

Diff

  1. Go into the Beyond Compare installation folder (eg, C:\Program Files\Beyond Compare 3).
  2. Create a batch file named "bc3svn.bat" with one line:
      

"C:\Progra~1\Beyond~1\bcomp.exe" "%6" /title1=%3 "%7" /title2=%5

  1. Go into Subversion's per-user configuration area, typically C:\Documents and Settings\<username>\Application Data\Subversion.
  2. Edit "config" and change the following lines:
      

# [helpers]

  1.   

# diff-cmd = diff_program (diff, gdiff, etc.)

  1. to:
      

[helpers]

  1.   

diff-cmd = C:\Progra~1\Beyond~1\bc3svn.bat

Merge (v3 Pro)

  1. Go into the Beyond Compare installation folder (eg, C:\Program Files\Beyond Compare 3).
  2. Create a batch file named "bc3mer.bat" with one line:
      

"C:\Progra~1\Beyond~1\bcomp.exe" "%2" "%3" "%1" "%4"

  1. Go into Subversion's per-user configuration area, typically C:\Documents and Settings\<username>\Application Data\Subversion.
  2. Edit "config" and change the following lines:
      

# [helpers]

  1.   

# merge-tool-cmd = merge_program

  1. to:
      

[helpers]

  1.   

merge-tool-cmd = C:\Progra~1\Beyond~1\bc3mer.bat

Cygwin  ( http://www.cygwin.com/ )

Instead of using a batch file, create a file named "bc.sh" with the following line:

"$(cygpath 'C:\Progra~1\Beyond~1\bcomp.exe')" `cygpath -w "$6"` `cygpath -w "$7"` /title1="$3" /title2="$5" /readonly Linux

Diff:

Create a file named /usr/bin/bcdiff.sh and allow execute permissions (chmod +x). Add the following line:

/usr/bin/bcompare "$6" "$7" -title1="$3" -title2="\"$5\"" -readonly
exit 0

Edit "$HOME/.subversion/config" and add the line "diff-cmd = /usr/bin/bcdiff.sh".

Merge:

Create a file named /usr/bin/bcmerge.sh and allow execute permissions (chmod +x). Add the following line:

/usr/bin/bcompare "$2" "$3" "$1" "$4"

Edit "$HOME/.subversion/config" and add the line "merge-tool-cmd = /usr/bin/bcmerge.sh".


SURROUND SCM

Diff

  1. User Options.
  2. Diff/Merge
  3. Add or edit an entry for File Type "All other text files", with Diff/Merge set to Diff.
  4. Enter selected application: "C:\Program Files\Beyond Compare 3\bcomp.exe" "%1" "%2" and click OK.

3-way Merge

  1. User Options.
  2. Diff/Merge
  3. Add or edit an entry for File Type "All other text files", with Diff/Merge set to Merge.
  4. Enter selected application: "C:\Program Files\Beyond Compare 3\bcomp.exe" "%1" "%2" "%3" /mergeoutput="%2" /automerge /reviewconflicts and click OK.

2-way Merge

  1. User Options.
  2. Diff/Merge
  3. Add or edit an entry for File Type "All other text files", with Diff/Merge set to Merge.
  4. Enter selected application: "C:\Program Files\Beyond Compare 3\bcomp.exe" "%1" "%2" /mergeoutput="%2" /reviewconflicts and click OK.


TEAM COHERENCE

  1. Options from the Tools
  2. Difference Viewers
  3. Application
  4. Parameters


TEAM FOUNDATION SERVER (TFS)

Diff

  1. Options from the Tools
  2. Source Control
  3. Visual Studio Team Foundation Server
  4. Configure User Tools
  5. Add
  6. Extension
  7. Compare in the Operation
  8. Command
  9. Arguments edit, use:

%1 %2 /title1=%6 /title2=%7

3-way Merge

  1. Follow steps 1-6 above.
  2. Merge in the Operation
  3. Command
  4. Arguments edit, use:

%1 %2 %3 %4 /title1=%6 /title2=%7 /title3=%8 /title4=%9

2-way Merge

Use the same steps as the 3-way merge above, but use the command line:

%1 %2 /savetarget=%4 /title1=%6 /title2=%7

TELELOGIC SYNERGY

  1. Close CMSynergy application.
  2. Go into your %userprofile% folder (type %userprofile% in explorer address bar if you are unsure where this is).
  3. Create a backup of the file named "ccm.ini".
  4. Edit "ccm.ini" and change the lines for Compare_cmd and merge_cmd to:
      

Compare_cmd = C:\Progra~1\Beyond~1\bcomp.exe %file1 %file2 /lefttitle=%file1_label /righttitle=%file2_label

  1.   

merge_cmd = C:\Program~1\Beyond~1\bcomp.exe %file1 %file2 %ancestor /mergeoutput=%outfile /lefttitle=%file1_label /righttitle=%file2_label


TORTOISECVS

Diff, 2-way Merge

  1. Start Preferences application.
  2. Tools
  3. Diff application: 

C:\Program Files\Beyond Compare 3\BComp.exe

  1. 2-way diff parameters: 

/readonly "%1" "%2"

  1. Merge application: 

C:\Program Files\Beyond Compare 3\BComp.exe

  1. 2-way merge parameters: 

/leftreadonly "%mine" "%yours"

TORTOISEHG

See Mercurial / HG.


TORTOISEGIT

Diff

  1. TortoiseGit | Settings
  2. Diff Viewer section under External Programs
  3. TortoiseMerge to External.
  4. In the path edits, enter:

"C:\Program Files\Beyond Compare 3\BComp.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly

3-way Merge

  1. TortoiseGit | Settings
  2. Merge Tool section under External Programs
  3. TortoiseMerge to External.
  4. In the path edits, enter:

"C:\Program Files\Beyond Compare 3\BComp.exe" %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname


TORTOISESVN

Diff

  1. Settings from Explorer's TortoiseSVN
  2. Diff Viewer
  3. TortoiseMerge to External.
  4. In the path edits, enter:

"C:\Program Files\Beyond Compare 3\BComp.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly

Advanced button on theDiff Viewer

3-way Merge

  1. Settings from Explorer's TortoisSVN
  2. Merge Tool
  3. TortoiseMerge to External.
  4. In the path edits, enter:

"C:\Program Files\Beyond Compare 3\BComp.exe" %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname

2-way Merge

Use the same steps as above, but use the command line:


"C:\Program Files\Beyond Compare 3\BComp.exe" %mine %theirs /savetarget=%merged

VAULT / FORTRESS

See SourceGear Vault / Fortress.


VERSIONMASTER

  1. User Specific Options from the Tools | Options
  2. Visual Differencing
  3. Use Custom Visual Differencer.
  4. Enter the path to BComp.exe in the edit.


VISUAL SOURCESAFE 2005

Diff

  1. Open the Visual SourceSafe Explorer.
  2. Options from the Tools
  3. Custom Editors
  4. File Difference in the Operation
  5. File Extension
  6. Command Line: edit:
      

"C:\Program Files\Beyond Compare 3\bcomp.exe" %1 %2

  1. Add

Merge

  1. Open the Visual SourceSafe Explorer.
  2. Options from the Tools
  3. Custom Editors
  4. File Merge in the Operation
  5. File Extension
  6. Command Line edit:
      

"C:\Program Files\Beyond Compare 3\bcomp.exe" %1 %2 /savetarget=%4

  1. Add

Visual SourceSafe 6.0 and earlier do not support external difference utilities.  SourceOffSite and VersionMaster can both use Beyond Compare in combination with SourceSafe.


VISUAL STUDIO WITH VISUAL SOURCESAFE 2005

Supported for "Microsoft Visual SourceSafe" plug-in.  The "Microsoft Visual SourceSafe (Internet)" plug-in does not support external diff tools.

  1. Open Visual Studio.
  2. Options from the Tools
  3. Plug-In Settings under the Source Control
  4. Visual SourceSafe under Plug-In Settings
  5. Advanced
  6. Custom Editor
  7. File Difference in the Operation
  8. File Extension
  9. Command Line edit:
      

"C:\Program Files\Beyond Compare 3\bcomp.exe" %1 %2

  1. Add


WINCVS

  1. Preferences from the Admin
  2. WinCVS
  3. External diff
  4. External diff edit.

//z 2013-07-23 17:03:49 IS2120@BG57IV3.T596097240 .K[T43,L2692,R15,V1089]
Beyond Compare 设置 配置