Beyond compare для linux

Beyond compare для linux

Full ownership after 60 months

Long term service fee 30 %

Total purchase price 32,500

Use the domain shortly after payment

After the first payment, our system automatically transfers the domain to our own holding registrar to keep it safe and available for you. Once the transfer is done (this can vary per domain since some registrars approve transfers only after 5 days) you can manage the DNS of the domain via your Buyer Control Panel.

Domain transfer after the final installment is paid

When the final installment is paid for, we will assist you with transferring the domain to a registrar of your choice and changing the ownership records of the domain.

Stop at any time

You can cancel an installment transaction whenever you want. This is only available for buyers. Sellers can’t cancel the contract, as long as you do not miss any final monthly payment deadline(s). When you opt to cancel a transaction, the received installments will be kept by the seller. You won’t receive the ownership of the domain and the domain will be returned to the original seller.

Long term service fee

Long term service fee is a fee percentage added when you pick a period longer than 1 year. The fee is included in the price you see in the Lease to Own dialog.

Domain price	Installments	Service fee
$1,000	1 — 12 months	$0 (0%)
$1,000	13 — 24 months	$100 (10%)
$1,000	25 — 36 months	$200 (20%)
$1,000	37 — 60 months	$300 (30%)

The service fee covers the transfer & renewal expenses of the domain, hosting DNS, providing support for years, and the recurring monthly payment processing expenses that Dan makes to facilitate this type of transaction.

Estimate in RUB

Conversion

This amount is an estimate based on the most recent currency conversion rate.

Источник

Linux Context Menu Does Not Appear

If the Linux Context Menu does not appear in the right-click menu on a file or folder, please follow this troubleshooting guide.

First, please be sure that the most recent version of Beyond Compare is installed. Different versions of Linux continuously change their support, and updates are required to match these alterations. To get the latest version of Beyond Compare, select Help | Check for Updates, or download from our website.

Next, launch Beyond Compare and open the Tools | Options dialog. In the Startup section, verify that Include Beyond Compare in Explorer Context menu is enabled and that at least one of the sub-options is set to show on the menu (Compare, Compare Using, etc). For this option to take affect, either log off and back on, or reboot your computer.

If the above does not resolve the issue and you are comfortable with manually installing the Linux shell extension, refer to this manual installation guide. Otherwise, contact us for assistance.

If you’re a developer and you’d like to add context menu support for an unsupported Linux distribution, please see our GitHub repository for the source code. If you add context menu support for a previously unsupported distribution, please send us a pull request and we’ll merge it into our official software release.

Known Issues

Debian 7 ‘Wheezy’ (XFCE/Thunar Example)

Requires user to manually copy our shell extension to Thunar’s expected location.

32 bit: cp /usr/lib/beyondcompare/ext/bcompare-ext-thunarx.i386.so /usr/lib/i386-linux-gnu/thunarx-2/bcompare-ext-thunarx.so

64 bit: cp /usr/lib32/beyondcompare/ext/bcompare-ext-thunarx.amd64.so /usr/lib/x86_64-linux-gnu/thunarx-2/bcompare-ext-thunarx.so

Ubuntu 18.04, Debian 9 ‘Stretch’ (Gnome/Nautilus Example)

Requires user to manually copy our shell extension to Nautilus’ expected location.

32 bit: cp /usr/lib/beyondcompare/ext/bcompare-ext-nautilus.i386.so /usr/lib/i386-linux-gnu/nautilus/extensions-3.0/bcompare-ext-nautilus.so

64 bit: cp /usr/lib/beyondcompare/ext/bcompare-ext-nautilus.amd64.so /usr/lib/x86_64-linux-gnu/nautilus/extensions-3.0/bcompare-ext-nautilus.so

Fedora 25-28 (Gnome)

KDE5 — Could not find the program ‘/usr/lib/beyondcompare/kde_context_menu’

Leftover context menu settings after an upgrade from Beyond Compare 4.2.6 (or older) can cause an error:
«Could not find the program ‘/usr/lib/beyondcompare/kde_context_menu'»

To fix the problem, remove old context menu settings with the terminal command:

rm

/.local/share/kservices5/ServiceMenus/beyondcompare*

Logout and then log back in, or perform a system restart.

Источник

Linux Installation Instructions

BC version 3 or 4

Debian, Ubuntu

Beyond Compare 4.1 and newer require matching package and OS architecture (amd64.deb or i386.deb). Beyond Compare 3 — 4.0.7 require the i386.deb package on all supported versions of Debian and Ubuntu (32-bit and 64-bit).

Beyond Compare 3 on Debian 8, 9 64-bit

Enable 32-bit architecture support: sudo dpkg —add-architecture i386

Graphical Install

Double click on the .deb package to install using the graphical package manager.

Terminal Install

wget https://www.scootersoftware.com/bcompare-4.4.0.25886_amd64.deb
sudo apt-get update
sudo apt-get install gdebi-core
sudo gdebi bcompare-4.4.0.25886_amd64.deb

Terminal Uninstall

sudo apt-get remove bcompare

Redhat Enterprise Linux, Fedora, CentOS

Beyond Compare 4.1 and newer require matching package and OS architecture (x86_64.rpm or i386.rpm). Beyond Compare 3 — 4.0.7 require the i386.rpm package on all supported versions of RHEL, Fedora and CentOS (32-bit and 64-bit).

Graphical Install

Double click on the .rpm package to install using the graphical package manager.

Terminal Install

wget https://www.scootersoftware.com/bcompare-4.4.0.25886.x86_64.rpm
su
rpm —import https://www.scootersoftware.com/RPM-GPG-KEY-scootersoftware
yum install bcompare-4.4.0.25886.x86_64.rpm

Terminal Uninstall

su
yum remove bcompare

openSUSE

Beyond Compare 4.1 and newer require matching package and OS architecture (x86_64.rpm or i386.rpm). Beyond Compare 3 — 4.0.7 require the i386.rpm package on all versions of openSUSE (32-bit and 64-bit).

Terminal Install

su
rpm —import https://www.scootersoftware.com/RPM-GPG-KEY-scootersoftware
zypper refresh
zypper install https://www.scootersoftware.com/bcompare-4.4.0.25886.x86_64.rpm

Terminal Uninstall

su
zypper remove bcompare

Installation using .tar.gz

This is the only install method that allows installation by non-root users. It is also appropriate for Linux distributions that don’t support .deb or .rpm packages. This method requires manual installation of dependencies, so if your distribution supports .deb or .rpm, you should use those packages instead of .tar.gz.

If you run the .tar.gz installer as root, Beyond Compare is installed system wide. If you run the .tar.gz installer as a normal user, it is installed in the current user’s home directory.

BC version 4

Version: 4.4.0, build 25886, released Aug. 13, 2021
64-bit TAR.GZ format 20358kb
32-bit TAR.GZ format 13614kb

BC version 3

Version: 3.3.13, build 18981, released Oct. 1, 2014
TAR.GZ format 10175kb

Terminal Install

tar zxvf bcompare-4.4.0.25886.i386.tar.gz
cd bcompare-4.4.0.25886
./install.sh

Terminal Uninstall (installed as normal user)

Terminal Uninstall (installed as root)

Источник

Linux Distribution Compatibility

BC version 3 or 4 only

Beyond Compare does not run as a console application on Linux. It requires the X window system.

Compatible Linux distributions

Distributions supported with default desktop environment unless otherwise noted.

Linux distribution	BC version
3.3.13	4.0.7	4.1	4.3.1+
CentOS 7	x	x	x	x
CentOS 8	x
Debian 9	x	x	x	x
Debian 10	x	x
Debian 11	x
Fedora 32	x
Fedora 33	x
Linux Mint 18 Cinnamon	x	x	x	x
Linux Mint 19 Cinnamon	x	x
Linux Mint 20 Cinnamon	x
Redhat Enterprise Linux 5	x	x
Redhat Enterprise Linux 6	x	x	x	x
Redhat Enterprise Linux 7	x	x	x	x
Redhat Enterprise Linux 8	x
Ubuntu 16.04 LTS	x	x	x	x
Ubuntu 18.04 LTS	x	x
Ubuntu 20.04 LTS	x

Prior to version 4.1, 64-bit distributions required 32-bit compatibility libraries. Using the .deb/.rpm packages with apt-get/yum, or your distribution’s associated package manager will install them automatically.

Other Linux Distributions

Limited technical support is provided for Linux distributions and desktop environments that haven’t passed compatibility testing.

Источник

Using Beyond Compare with Version Control Systems

For macOS, see this article.

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 version 4.

Beyond Compare version 3 users should replace «4» with «3» appropriately.

Beyond Compare version 2 users should replace BComp.exe with BC2.exe and change the path to Beyond Compare 2’s install folder.

Linux users should prefix command line switches with «-» instead of «/».

64-bit Windows users of 32-bit BC (older than version 4.1) should replace «C:\Program Files» with «C:\Program Files (x86)» .

AccuRev

Windows

1. Select Preferences from the Tools menu.
2. Switch to the Diff/Merge tab.
3. Diff: overwrite the preset with: «C:\Program Files\Beyond Compare 4\bcomp.exe» %1% %2% /lefttitle=»%3%» /righttitle=»%4%»
4. Merge: overwrite the preset with: «C:\Program Files\Beyond Compare 4\bcomp.exe» %1% %2% %a% /mergeoutput=%o% /lefttitle=»%4%» /righttitle=»%5%» /centertitle=»%3%»

Linux

1. Select Preferences from the Tools menu.
2. Switch to the Diff/Merge tab.
3. Diff: overwrite the preset with: /usr/bin/bcompare %1% %2% -lefttitle=»%3%» -righttitle=»%4%»
4. Merge: overwrite the preset with: /usr/bin/bcompare %1% %2% %a% -mergeoutput=%o% -lefttitle=»%4%» -righttitle=»%5%» -centertitle=»%3%»

AnkhSVN

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

CA Harvest Software Change Manager

1. Open the Workbench.
2. Select Options from the Tools menu.
3. Switch to the Merge Tool tab in the Options dialog.
4. Select «Beyond Compare» in the ToolName drop-down.
5. Enter the complete path to your BComp.exe in the Compare, 2-way Merge, and 3-way Merge fields:

Compare

2-way Merge

3-way Merge

ClearCase

1. Go into the «C:\Program Files\IBM\RationalSDLC\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 xcompare C:\Program Files\Beyond Compare 4\BComp.exe
   text_file_delta xmerge C:\Program Files\Beyond Compare 4\BComp.exe

Make the same change to lines beginning with _html , _xml , _html2 , _xml2 to use Beyond Compare for HTML and XML comparisons.

BC version 2

For BC2, 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

CCRC 7.1.1+

CCRC Older versions

1. Locate the plugins folder, which will contain a specific version named subfolder. Examples:
   • C:\Program Files\IBM\Rational\ClearCase701\CCRC\plugins\com.ibm.rational.clearcase.compare_merge.win32.x86_7.0.1.D061004
   • C:\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.
2. Copy C:\Program Files\Beyond Compare 4\bcomp.exe into the folder.
3. Move ccrc_cleardiff.exe, ccrc_cleardiffmrg.exe, ccrc_worddiffmrg.exe and ccrc_xmldiffmrg.exe to a backup folder.
4. Make 4 copies of bcomp.exe and rename them to ccrc_cleardiff.exe, ccrc_cleardiffmrg.exe, ccrc_worddiffmrg.exe and ccrc_xmldiffmrg.exe.
5. Change «CCRC Integrated (UTF-8)» to «ClearCase External» under Preferences | CCRC | Integration | Compare_Merge.

CVS does not support external diff or merge tools.

Dimensions CM / PVCS / Serena

BC version 3 or 4

1. Navigate to the Dimensions / PVCS install folder and find the file pvcsmerge.exe and rename it to pvcsmerge.exe.exe .
2. Copy bcomp.exe from C:\Program Files\Beyond Compare 4 into the Dimensions folder and rename it to pvcsmerge.exe .

In Dimensions CM 10 you can edit your native.properties file instead. The integration isn’t as complete in that case, so file format/rules matching don’t work correctly and folder comparisons aren’t supported.

BC version 3 or 4 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

Follow the instructions above, but instead of using BComp.exe use the copy of pvcsmerge.exe in pvcsmergev8.zip for PVCS 6.8, 8.0, and Merant Dimensions 8, or in pvcsmerge75.zip for PVCS 7.5.

Git for Linux

BC version 3 or 4

Git 1.8 and newer

To launch a diff using Beyond Compare, use the command
git difftool file.ext

Merge

To launch a 3-way merge using Beyond Compare, use the command
git mergetool file.ext

Git 1.7.x and older

(Instructions vary depending on Git version)

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
   «

» «$2» «$5» | cat

In a console window enter the command:
$ git config —global diff.external

3-way Merge

2-way Merge

Git for Windows

BC version 3 or 4

Note: For Git versions older than 2.2 (git —version) replace «bc» with «bc3» in the above instructions.

3-way Merge

Note: For Git versions older than 2.2.0 (git —version) replace «bc» with «bc3» in the above instructions.

Launching Diffs and Merges

File Diff:
git difftool filename.ext

Folder Diff:
git difftool —dir-diff

3-way Merge:
git mergetool filename.txt

Advanced Settings

To disable the «Launch ‘bc3’ [Y/n]?» prompt, run the command:
git config —global difftool.prompt false

Git’s default settings retain merge files with *.orig extensions after a successful merge. To disable this safety feature and automatically delete *.orig files after a merge, run the command:
git config —global mergetool.keepBackup false

Git Integration for Eclipse (EGit)

Git integration for Eclipse (EGit) does not support external diff and merge tools.
Eclipse bug tracker: Bug 356832 — Allow use of external mergetool.

GitHub Desktop

GitHub Desktop does not support external diff and merge tools.
GitHub feature request: Open with external diff tool #1765.

Git Extensions

BC version 3 or 4

1. Select Settings from the Tools menu.
2. Select Git Config.
3. Select «bc» from the Difftool drop down.
4. Ensure that Path to difftool field contains:
   C:/Program Files/Beyond Compare 4/BComp.exe
5. Ensure Difftool command field contains:
   «C:/Program Files/Beyond Compare 4/BComp.exe» «$LOCAL» «$REMOTE»

Merge

1. Select Settings from the Tools menu.
2. Select Git Config.
3. Select «bc» from the Mergetool drop down.
4. Ensure that Path to mergetool field contains:
   C:/Program Files/Beyond Compare 4/BComp.exe
5. Ensure Mergetool command field contains:
   «C:/Program Files/Beyond Compare 4/BComp.exe» «$LOCAL» «$REMOTE» «$BASE» «$MERGED»

Git Fork

BC version 3 or 4

1. Select Preferences from the File menu.
2. Select Integration.
3. Select «Custom» from the Diff Tool drop down.
4. Ensure that Diff Tool Path field contains:
   C:/Program Files/Beyond Compare 4/BComp.exe
5. Ensure Arguments field contains:
   «$LOCAL» «$REMOTE»

Merge

1. Select Preferences from the File menu.
2. Select Integration.
3. Select «Custom» from the Merger drop down.
4. Ensure that Merger Path field contains:
   C:/Program Files/Beyond Compare 4/BComp.exe
5. Ensure Arguments field contains:
   «$LOCAL» «$REMOTE» «$BASE» «$MERGED»

KDESVN

1. In KDESVN Choose Configure KDESVN from the Settings menu.
2. Select Diff & Merge.
3. Check Use external diff display.
4. In the External diff display edit, use:
   bcompare -readonly %1 %2
5. In the External merge program edit, use:
   bcompare %s1 %s2 %t
6. In the External resolver program edit, use:
   bcompare %n %m %o %t

Mercurial / TortoiseHg

BC version 3 with TortoiseHg 2.0.2 and newer

BC version 4 with TortoiseHg 3.1 and newer

1. Launch TortoiseHG Workbench.
2. Under the File menu go to Settings.
3. Select TortoiseHg.
4. Set Visual Diff Tool to beyondcompare4 using the dropdown.

3-way Merge

1. Launch TortoiseHG Workbench.
2. Under the File menu go to Settings.
3. Select TortoiseHg
4. Set the Three-way Merge Tool to beyondcompare4 using the dropdown.

Older versions of Mercurial

To configure Mercurial you need to edit the file %USERPROFILE%\Mercurial.ini or $HOME/.hgrc . Add the following lines, using existing INI sections if they already exist:

[extdiff]
cmd.bcomp = C:\Program Files\Beyond Compare 4\BComp.exe
opts.bcomp = /ro

[tortoisehg]
vdiff = bcomp

Once set up you can compare revisions from the command line using
hg bcomp -r [-r ] [ ]

3-way Merge

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

MKS Integrity / PTC Integrity

1. Start MKS Source Integrity.
2. Go to Tools | Preferences | DiffTool.
3. Select Custom Command.
4. Enter the command:
   «C:\Program Files\Beyond Compare 4\BComp.exe» /title1=»<1>» /title2=»<2>» «<3>» «<4>«

3-way Merge

Use this for the merge tool command line:
«C:\Program Files\Beyond Compare 4\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 4\BComp.exe» /title1=»<1>» /title2=»<2>» «<5>» «<6>» /savetarget=»<7>«

NetBeans

1. Select Options from the Tools menu.
2. Select Miscellaneous.
3. Go to the Diff tab.
4. Select External Diff.
5. Command: C:\Program Files\Beyond Compare 4\BComp.exe

Once configured, selecting Team | Local History | Show Local History will launch a diff in Beyond Compare.

Perforce

P4V (The Perforce Visual Client)

1. Choose Preferences from the Edit menu.
2. Switch to the Diff tab.
3. Change the Default Diff Application option to «Other application».
4. Enter the path to BComp.exe in the Location edit.
5. For some versions of Perforce, in the Arguments edit, enter:
   %1 %2
6. Switch to the Merge tab.
7. Change the Default merge application to «Other application».
8. Enter the path to BComp.exe in the Location edit.
9. In the Arguments edit, enter:
   %1 %2 %b %r

P4Win (The Perforce Windows Client)

1. Choose Options from the Settings menu.
2. Select Files > Diff.
3. Select User supplied diff application.
4. Browse to BComp.exe.
5. Check Options args and enter:
   /lefttitle=»%L» /righttitle=»%R» %1 %2
6. Select Files > Merge.
7. Select User supplied merge application.
8. Browse to BComp.exe.
9. Check 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 4\BComp.exe
   P4MERGE=C:\Program Files\Beyond Compare 4\BCompP4Merge.bat
2. Create a file named BCompP4Merge.bat in your Beyond Compare install folder with the contents: «C:\Program Files\Beyond Compare 4\BComp» %2 %3 %1 %4

Plastic SCM

1. Choose Diff tools from the Preferences menu.
2. Select $text, choose Edit.
3. Add the command line:
   «C:\Program Files\Beyond Compare 4\BComp.exe» «@sourcefile» «@destinationfile» /lefttitle=»@sourcesymbolic» /righttitle=»@destinationsymbolic»

Merge

1. Choose Merge tools from the Preferences menu.
2. Select $text, choose Edit.
3. Add the command line:
   «C:\Program Files\Beyond Compare 4\BComp.exe» /title1=»@sourcesymbolic» /title2=»@destinationsymbolic» /title3=»@basesymbolic» «@sourcefile» «@destinationfile» «@basefile» «@output»

Rational Synergy

Java Client, Diff

1. Create the batch file: C:\Program Files\Beyond Compare 4\bc4_comp.bat
2. In the batch file, enter: «C:\Program Files\Beyond Compare 4\BComp.exe» %1 %2 /lefttitle=%3 /righttitle=%4
3. Backup the file «C:\Program Files\IBM\Rational\Synergy\7.1\etc\ccm.properties».
4. In ccm.properties, edit the compare line: windows.tool.compare.ascii = «C:\Program Files\Beyond Compare 4\bc4_comp.bat» «%file1» «%file2» «%file1_label» «%file2_label»

Java Client, 3-way Merge

1. Create the batch file: C:\Program Files\Beyond Compare 4\bc4_merge.bat
2. In the batch file, enter: «C:\Program Files\Beyond Compare 4\BComp.exe» %1 %2 %3 %4 /lefttitle=%5 /righttitle=%6 /centertitle=%7 /outputtitle=%4
3. Backup the file «C:\Program Files\IBM\Rational\Synergy\7.1\etc\ccm.properties».
4. In ccm.properties, edit the merge line: windows.tool.merge.ascii = «C:\Program Files\Beyond Compare 4\bc4_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\\Beyond Compare 4\\bc4_comp.bat» «%file1» «%file2» «%file1_label» «%file2_label»

Classic Client, Diff

1. Close the Synergy application.
2. Create the batch file: C:\Program Files\Beyond Compare 4\bc4_comp.bat
3. In the batch file, enter: «C:\Program Files\Beyond Compare 4\BComp.exe» %1 %2 /lefttitle=%3 /righttitle=%4
4. Navigate into your %userprofile% directory (type %userprofile% in explorer address bar if you are unsure where this is).
5. Backup the file named «ccm.ini».
6. Edit the compare line in ccm.ini: compare_cmd = «C:\Program Files\Beyond Compare 4\bc4_comp.bat» «%file1» «%file2» «%file1_label» «%file2_label»

Classic Client, 3-way Merge

1. Close the Synergy application.
2. Create the batch file: C:\Program Files\Beyond Compare 4\bc4_merge.bat
3. In the batch file, enter: «C:\Program Files\Beyond Compare 4\BComp.exe» %1 %2 %3 %4 /lefttitle=%5 /righttitle=%6 /centertitle=%7 /outputtitle=%4
4. Navigate into your %userprofile% directory (type %userprofile% in explorer address bar if you are unsure where this is).
5. Backup the file named «ccm.ini».
6. Edit the merge line in ccm.ini: merge_cmd = «C:\Program Files\Beyond Compare 4\bc4_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 BC as the difftool:

1. Launch RoboHelp HTML.
2. Go to Tools | Options.
3. Select the Version Control section.
4. In the SharePoint Settings area, set Path to:
   C:\Program Files\Beyond Compare 4\BComp.exe
5. For Arguments, enter:
   %1 %2
6. 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»).
   to:
   ASSIGN Mexe = SEARCH(«C:\Progra

SmartGit

1. Select Edit | Preferences.
2. Go to Tools >Diff Tools.
3. Click Add.
4. File Pattern: *
5. Select External diff tool.
6. Command: C:\Program Files\Beyond Compare 4\bcomp.exe
7. Arguments: /readonly /lefttitle=»$» /righttitle=»$» «$» «$«

Merge

1. Select Edit | Preferences.
2. Go to Tools >Conflict Solvers.
3. Click Add.
4. File Pattern: *
5. Select External Conflict Solver.
6. Command: C:\Program Files\Beyond Compare 4\bcomp.exe
7. Arguments: «$» «$» «$» /mergeoutput=»$«

SourceAnyWhere for VSS

1. Select Tools | Options. Go to the External Programs tab.
2. Application for diff/merge:
   C:\Program Files\Beyond Compare 4\bcomp.exe
3. Arguments for diff files:
   /readonly /title1=»%FIRST_LABEL%» /title2=»%SECOND_LABEL%» «%FIRST_FILE%» «%SECOND_FILE%»
4. Arguments for diff folders:
   «%FIRST_DIR%» «%SECOND_DIR%»
5. Arguments for Two-way merge:
   /leftreadonly /title1=»%FIRST_LABEL%» /title2=»%SECOND_LABEL%» «%FIRST_FILE%» «%SECOND_FILE%»

Linux

In some versions of the Linux application, it may be necessary to define the path to bcompare with the arguments.

1. Application for diff/merge:
   /usr/bin/bcompare
2. Arguments for diff files:
   /usr/bin/bcompare -readonly «%FIRST_FILE%» «%SECOND_FILE%»
3. Arguments for diff folders:
   /usr/bin/bcompare «%FIRST_DIR%» «%SECOND_DIR%»

SourceGear Vault

1. Choose Options from the Tools menu.
2. Select Diff / Merge.
3. Under Diff, enter the path to BComp.exe for the Program setting.
4. In the Arguments edit, enter:
   «%LEFT_PATH%» «%RIGHT_PATH%» /ro /title1=»%LEFT_LABEL%» /title2=»%RIGHT_LABEL%»

3-way Merge

1. Choose Options from the Tools menu.
2. Select Diff / Merge.
3. Under Merge, enter the path to BComp.exe for the Program setting.
4. In the Arguments edit, enter:
   «%WORKING_PATH%» «%OTHER_PATH%» «%BASELINE_PATH%» «%DEST_PATH%» /title1=»%WORKING_LABEL%» /title2=»%OTHER_LABEL%» /title4=»%DEST_LABEL%»

2-way Merge

SourceOffSite

1. Choose Options from the Windows Client’s Tools menu.
2. Switch to the External Programs panel.
3. Enter the path to BComp.exe in the Application for comparing files, Application for comparing folders and Application for merging files edits.

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

SourceTree

1. Choose Options from the Tools menu.
2. Switch to the Diff tab.
3. Set the External Diff tool dropdown to Beyond Compare.

3-way Merge

1. Choose Options from the Tools menu.
2. Switch to the Diff tab.
3. Set the External Merge tool dropdown to Beyond Compare.

StarTeam

1. Choose Personal Options from the Tools menu.
2. Switch to the Files panel.
3. If it’s present, click the «Alternate Applications» button.
4. Check the Comparison Utility checkbox.
5. Enter the path to BComp.exe in the edit.
6. In the Options edit enter:
   $file1 $file2

3-way Merge

1. Follow steps 1-5 above, but check the Merge Utility checkbox in step 4.
2. In the Options edit enter:
   $usertip $branchtip $basefile $resultfile

2-way Merge is not supported because $resultfile is not expanded if used as an argument to /savetarget=.

Subversion

Windows

1. Go into the Beyond Compare installation folder (eg, C:\Program Files\Beyond Compare 4 ).
2. Create a batch file named «bc4svn.bat» containing:
   call «%

dp0\bcomp.exe» «%6» /title1=%3 «%7» /title2=%5
IF %errorlevel%==0 goto ZERO
EXIT /B 1
:ZERO
EXIT /B 0

Go into Subversion’s per-user configuration area, typically C:\Users\username\AppData\Roaming\Subversion .

Edit «config» and change the following lines:
# [helpers]
# diff-cmd = diff_program (diff, gdiff, etc.)
to:
[helpers]
diff-cmd = «C:\Program Files\Beyond Compare 4\bc4svn.bat»

Merge

1. Go into the Beyond Compare installation folder (eg, C:\Program Files\Beyond Compare 4 ).
2. Create a batch file named «bc4mer.bat» containing:
   call «%

dp0\bcomp.exe» «%2» «%3» «%1» «%4»
IF %errorlevel%==0 goto ZERO
EXIT /B 1
:ZERO
EXIT /B 0

Go into Subversion’s per-user configuration area, typically C:\Documents and Settings\ \Application Data\Subversion .

Edit «config» and change the following lines:
# [helpers]
# merge-tool-cmd = merge_program
to:
[helpers]
merge-tool-cmd = «C:\Program Files\Beyond Compare 4\bc4mer.bat»

Cygwin

Instead of using a batch file, create a file named «bc.sh» with the following line:
«$(cygpath ‘C:\Progra

1\bcomp.exe’)» `cygpath -w «$6″` `cygpath -w «$7″` /title1=»$3″ /title2=»$5» /readonly

Linux

Create a file named /usr/bin/bcdiff.sh and allow execute permissions (chmod +x). Add the following lines:
/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» in [Helpers].

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» in [Helpers].

Surround SCM

1. Open User Options.
2. Go to the Diff/Merge section.
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 4\bcomp.exe» «%1» «%2» and click OK.

3-way Merge

1. Open User Options.
2. Go to the Diff/Merge section.
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 4\bcomp.exe» «%1» «%2» «%3″ /mergeoutput=»%2» /automerge /reviewconflicts and click OK.

2-way Merge

1. Open User Options.
2. Go to the Diff/Merge section.
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 4\bcomp.exe» «%1» «%2″ /mergeoutput=»%2» /reviewconflicts and click OK.

Team Coherence

1. Choose Options from the Tools menu.
2. Switch to the Difference Viewers tab.
3. Enter the path to BComp.exe in the Application edit.
4. Enter /fv «$LF» /title1=»$LD» «$RF» /title2=»$RD» in the Parameters edit.

TortoiseCVS

Diff, 2-way Merge (3-way merge not supported)

1. Start Preferences application.
2. Switch to the Tools tab.
3. Diff application: C:\Program Files\Beyond Compare 4\BComp.exe
4. 2-way diff parameters: /readonly «%1» «%2»
5. Merge application: C:\Program Files\Beyond Compare 4\BComp.exe
6. 2-way merge parameters: /leftreadonly «%mine» «%yours»

TortoiseHg

TortoiseGit

1. Launch TortoiseGit | Settings
2. Switch to the Diff Viewer section under External Programs
3. Change the radio buttons from TortoiseMerge to External.
4. In the path edits, enter:
   «C:\Program Files\Beyond Compare 4\BComp.exe» %base %mine /title1=%bname /title2=%yname /leftreadonly

3-way Merge

1. Launch TortoiseGit | Settings
2. Switch to the Merge Tool section under External Programs
3. Change the radio buttons from TortoiseMerge to External.
4. In the path edits, enter:
   «C:\Program Files\Beyond Compare 4\BComp.exe» %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname

TortoiseSVN

1. Select Settings from Explorer’s TortoiseSVN submenu.
2. Switch to the Diff Viewer tab.
3. Change the radio buttons from TortoiseMerge to External.
4. In the path edits, enter:
   «C:\Program Files\Beyond Compare 4\BComp.exe» %base %mine /title1=%bname /title2=%yname /leftreadonly

To use Beyond Compare for image comparisons either replace the file C:\Program Files\TortoiseSVN\bin\TortoiseIDiff.exe with a copy of BComp.exe, or click the Advanced button on the Diff Viewer tab and add each image type’s extension with the same command line as above.

3-way Merge

1. Select Settings from Explorer’s TortoisSVN submenu.
2. Switch to the Merge Tool tab.
3. Change the radio buttons from TortoiseMerge to External.
4. In the path edits, enter:
   «C:\Program Files\Beyond Compare 4\BComp.exe» %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname

2-way Merge

Tower (Git)

1. Open Tower’s preferences dialog on the Git Config Tab.
2. Set the Diff Tool drop-down to Beyond Compare.
3. Set the Merge tool drop-down to Beyond Compare.

Visual SourceSafe 2005

1. Open the Visual SourceSafe Explorer.
2. Select Options from the Tools menu.
3. Switch to the Custom Editors tab in the SourceSafe Options dialog.
4. Select File Difference in the Operation drop-down.
5. Enter «.*» in the File Extension edit.
6. Enter this in the Command Line: edit:
   «C:\Program Files\Beyond Compare 4\bcomp.exe» %1 %2
7. Click the Add button.

Merge

1. Open the Visual SourceSafe Explorer.
2. Select Options from the Tools menu.
3. Switch to the Custom Editors tab in the SourceSafe Options dialog.
4. Select File Merge in the Operation drop-down.
5. Enter «.*» in the File Extension edit.
6. Enter this in the Command Line edit:
   «C:\Program Files\Beyond Compare 4\bcomp.exe» %1 %2 /savetarget=%4
7. Click the Add button.

Visual SourceSafe 6.0 and earlier do not support external difference utilities.

Visual Studio — Git

1. Open Visual Studio.
2. Select Options from the Tools menu.
3. Select Plug-In Selection under the Source Control branch of the left-side tree control.
4. Select Git under Current source control plug-in on the right-hand pane.
5. After starting a project in a Git repository, edit the config file in the .git folder in the project folder.
6. Change the config file to reflect the following changes:
   [diff]
   tool = bc4
   [difftool «bc4»]
   cmd = \»C:\\Program Files\\Beyond Compare 4\\BComp.exe\» \»$LOCAL\» \»$REMOTE\»
   [merge]
   tool = bc4
   [mergetool «bc4»]
   cmd = \»C:\\Program Files\\Beyond Compare 4\\BComp.exe\» \»$REMOTE\» \»$LOCAL\» \»$BASE\» \»$MERGED\»

Visual Studio — Team Foundation Server (TFS)

1. In Visual Studio Choose Options from the Tools menu.
2. Expand Source Control in the treeview.
3. Click Visual Studio Team Foundation Server in the treeview.
4. Click the Configure User Tools button.
5. Click the Add button.
6. Enter «.*» in the Extension edit.
7. Choose Compare in the Operation combobox.
8. Enter the path to BComp.exe in the Command edit.
9. In the Arguments edit, use:
   %1 %2 /title1=%6 /title2=%7

3-way Merge

1. Follow steps 1-6 above.
2. Choose Merge in the Operation combobox.
3. Enter the path to BComp.exe in the Command edit.
4. In the 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

Visual Studio — 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 2015.
2. Select Options from the Tools menu.
3. Select Plug-In Settings under the Source Control branch of the left-side tree control.
4. Select Visual SourceSafe under Plug-In Settings on the right-hand pane.
5. Press the Advanced button.
6. Select the Custom Editor tab in the «SourceSafe Options» pane.
7. Select File Difference in the Operation drop-down.
8. Enter «.*» in the File Extension edit.
9. Enter this in the Command Line edit:
   «C:\Program Files\Beyond Compare 4\bcomp.exe» %1 %2
10. Click the Add button and close all dialog boxes.

End of Support

Microsoft ended support for Visual SourceSafe in 2017. Scooter Software recommends migrating from SourceSafe to an actively supported version control solution such as Git, Team Foundation Server, etc.

Limitations

A SourceSafe diff launched from Visual Studio 2015 opens as a modal window, blocking interaction with Visual Studio until the diff window is closed. This SourceSafe limitation affects both SourceSafe’s built-in diff tool and Beyond Compare.

Источник