macOS only

Beyond Compare can be configured as the external difference utility in many popular VCS applications. The following are configuration instructions submitted by our users. Let us know if you have one to add to the list.

Index:
Cornerstone SVNGitGit ForkIntelliJ IDEA 12Mercurial 2.4.2PerforceSmartCVSSmartGitSmartSVNSourceTreeSubversionSyncovery MacTower (Git)

Cornerstone SVN

If you purchased a license for Tower for Mac (v1 or v2) or Tower for Windows (v1) before, you'll receive a 50% discount on your first year with the new Tower - for any number of seats. Simply keep your old license key ready during checkout. SourceTree will open, and a URL Actions pop-up window should appear with the details of the repository you're cloning. In the Mac version, it is called Remote. Jira Cloud for Mac is dark-mode enabled Snappier and more nimble than ever It’s now faster than ever to navigate to and complete the most common tasks in Jira. MacとWindowsでは、SourceTreeのデザインにはそこまでデザインの違いはありません。 以下は基本的にWindowsの画面で進めていきます。 まずやることは、「SourceTreeでGitを操作したいプロジェクトを選択し、SourceTreeで表示する」という作業です。. Platforms: Mac, Windows Price: Free License: Proprietary GitHub Desktop. Platforms: Mac, Windows Price: Free License: MIT TortoiseGit. Platforms: Windows.

In Cornerstone, you can specify a custom external compare script.

SourceTree For Mac

Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.

DIFF

Create an AppleScript wrapper for use by Cornerstone:

Set in PreferencesGeneralExternal compare toolOther Script...

Git

Mac

Git 2.3 and newer

(Note: Use bc3 on the command line for BC version 4. Caused by git legacy support from Linux.)

Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.

Diff

In a terminal:
git config --global diff.tool bc3

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

Merge

In a terminal:
git config --global merge.tool bc3
git config --global mergetool.bc3.trustExitCode true

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


Older versions of Git

  1. Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
  2. Add the following lines to $HOME/.gitconfig:
    [diff]
    tool = bcomp
    [difftool]
    prompt = false
    [difftool 'bcomp']
    trustExitCode = true
    cmd = '/usr/local/bin/bcomp' '$LOCAL' '$REMOTE'
    [merge]
    tool = bcomp
    [mergetool]
    prompt = false
    [mergetool 'bcomp']
    trustExitCode = true
    cmd = '/usr/local/bin/bcomp' '$LOCAL' '$REMOTE' '$BASE' '$MERGED'
  3. To launch a diff in Beyond Compare, use: git difftool file.ext
    To launch a merge in Beyond Compare, use: git mergetool file.ext

Git Fork

Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.

Diff

  1. Select Preferences from the Fork menu.
  2. Select Integration.
  3. Select 'Beyond Compare' from the External Diff Tool drop down.

Merge

  1. Select Preferences from the Fork menu.
  2. Select Integration.
  3. Select 'Beyond Compare' from the Merge Tool drop down.

IntelliJ IDEA

(Potentially, also RubyMine, Webstorm, PyCharm, PhpStorm)

The first step is to launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.

In IntelliJ's Settings dialog, under IDE Settings, select the External Diff Tools section:

Compare folders
Path to executable: /usr/local/bin/bcomp
Compare files
Path to executable: /usr/local/bin/bcomp
Merge tool
Path to executable: /usr/local/bin/bcomp
Parameters: %1 %2 %3 %4

Mercurial 2.4.2

Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.

Perforce

Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.

Sourcetree for mac big sur

Diff

  1. Go to the P4V menu and select Preferences.
  2. Go to the Diff section and select Other application.
  3. Location: /usr/local/bin/bcomp
  4. Arguments: %1 %2

Merge

  1. Go to the P4V menu and select Preferences.
  2. Go to the Merge section and select Other application.
  3. Location: /usr/local/bin/bcomp
  4. Arguments: %1 %2 %b %r
10.13.6

SmartCVS

  1. Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
  2. Launch SmartCVS, select PreferencesFile Comparators.
  3. Select * in the table and click edit.
  4. Add /usr/local/bin/bcomp in Command and ${leftFile} ${rightFile} in Arguments.
  5. Click OK.

SmartGit

Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.

Diff

  1. Select SmartGitPreferences.
  2. Go to Tools > Diff Tools.
  3. Click Add.
  4. File Pattern: *
  5. Select External diff tool.
  6. Command: /usr/local/bin/bcomp
  7. Arguments: -readonly -lefttitle=${leftTitle} -righttitle=${rightTitle} ${leftFile} ${rightFile}

Merge

  1. Select SmartGitPreferences.
  2. Go to Tools > Conflict Solvers.
  3. Click Add.
  4. File Pattern: *
  5. Select External Conflict Solver.
  6. Command: /usr/local/bin/bcomp
  7. Arguments: ${leftFile} ${rightFile} ${baseFile} -mergeoutput=${mergedFile}

SmartSVN

For
  1. Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
  2. Launch SmartSVN, select PreferencesFile Comparators.
  3. Select * in the table and click edit.
  4. Add /usr/local/bin/bcomp in Command and ${leftFile} ${rightFile} in Arguments.
  5. Click OK.

SourceTree

From the Beyond Compare menu, Install Command Line Tools. Then:

Subversion

Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.

Diff

Create a file named /usr/local/bin/bcdiff.sh and allow execute permissions (chmod +x). Add the following lines:
/usr/local/bin/bcomp '$6' '$7' -title1='$3' -title2='$5' -readonly
exit 0

Edit $HOME/.subversion/config and add the line diff-cmd = /usr/local/bin/bcdiff.sh in [Helpers].

Merge

Create a file named /usr/local/bin/bcmerge.sh and allow execute permissions (chmod +x). Add the following line:
/usr/local/bin/bcomp '$2' '$3' '$1' '$4'

Edit $HOME/.subversion/config and add the line merge-tool-cmd = /usr/local/bin/bcmerge.sh in [Helpers].

Syncovery Mac

The first step is to launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.

Then to configure Syncovery:

  1. Select menu Syncovery/Preferences.
  2. Click the Misc tab.
  3. In the field Program used to compare files from the Sync Preview, write /usr/local/bin/bcompare (or the pathname given when using BC4's Install Command Line Tools).
  4. Click Close.

Tower (Git)

(Requires Tower 2.0.5 or newer)
  1. Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
  2. Open Tower's preferences dialog on the Git Config Tab.
  3. Set the Diff Tool drop-down to Beyond Compare.
  4. Set the Merge tool drop-down to Beyond Compare.

Sourcetree Download For Mac

Git comes with built-in GUI tools for committing (git-gui) and browsing (gitk), but there are several third-party tools for users looking for platform-specific experience.

If you want to add another GUI tool to this list, just follow the instructions.

  • SourceTree

    Platforms: Mac, Windows
    Price: Free
    License: Proprietary

  • GitHub Desktop

    Platforms: Mac, Windows
    Price: Free
    License: MIT

  • TortoiseGit

    Platforms: Windows
    Price: Free
    License: GNU GPL

  • Git Extensions

    Platforms: Linux, Mac, Windows
    Price: Free
    License: GNU GPL

  • GitKraken

    Platforms: Linux, Mac, Windows
    Price: Free / $29 / $49
    License: Proprietary

  • Magit

    Platforms: Linux, Mac, Windows
    Price: Free
    License: GNU GPL

  • SmartGit

    Platforms: Linux, Mac, Windows
    Price: $79/user / Free for non-commercial use
    License: Proprietary

  • Tower

    Platforms: Mac, Windows
    Price: $79/user (Free 30 day trial)
    License: Proprietary

  • GitUp

    Platforms: Mac
    Price: Free
    License: GNU GPL

  • GitEye

    Platforms: Linux, Mac, Windows
    Price: Free
    License: Proprietary

  • gitg

    Platforms: Linux, Windows
    Price: Free
    License: GNU GPL

  • ungit

    Platforms: Linux, Mac, Windows
    Price: Free
    License: MIT

  • git-cola

    Platforms: Linux, Mac, Windows
    Price: Free
    License: GNU GPL

  • Cycligent Git Tool

    Platforms: Linux, Mac, Windows
    Price: Free
    License: Proprietary

  • giggle

    Platforms: Linux
    Price: Free
    License: GNU GPL

  • Gitbox

    Platforms: Mac
    Price: $14.99
    License: Proprietary

  • Aurees

    Platforms: Linux, Mac, Windows
    Price: Free
    License: Proprietary

  • Fork

    Platforms: Mac, Windows
    Price: $49.99, free evaluation
    License: Proprietary

  • Working Copy

    Platforms: iOS
    Price: Free with in-app purchases
    License: Proprietary

  • CodeReview

    Platforms: Linux, Mac, Windows
    Price: Free
    License: GNU GPL

  • gmaster

    Platforms: Windows
    Price: Beta / Free for non-commercial use
    License: Proprietary

  • Git2Go

    Platforms: iOS
    Price: Free with in-app purchases
    License: Proprietary

  • GitAhead

    Platforms: Linux, Mac, Windows
    Price: Free
    License: MIT

  • Pocket Git

    Platforms: Android
    Price: 1.99€
    License: Proprietary

  • GitDrive

    Platforms: iOS
    Price: Free with in-app purchases
    License: Proprietary

  • GitX-dev

    Platforms: Mac
    Price: Free
    License: GNU GPL

  • GitBlade

    Platforms: Linux, Mac, Windows
    Price: Free Lite version, $59.99/user/year for PRO version
    License: Proprietary

  • Guitar

    Platforms: Linux, Mac, Windows
    Price: Free
    License: GNU GPL

  • RepoZ

    Platforms: Mac, Windows
    Price: Free
    License: MIT

  • Cong

    Platforms: Windows
    Price: Free
    License: Proprietary

  • Sublime Merge

    Platforms: Linux, Mac, Windows
    Price: $99/user, $75 annual business sub, free eval
    License: Proprietary

  • LazyGit

    Platforms: Linux, Mac, Windows
    Price: Free
    License: MIT

  • SnailGit

    Platforms: Mac
    Price: $9.99 / Lite version
    License: Proprietary

  • GitAtomic

    Platforms: Windows
    Price: 15.00€
    License: Proprietary

  • Gitfox

    Platforms: Mac
    Price: €3.99/m or €24,99/y per user
    License: Proprietary

  • GitFiend

    Platforms: Linux, Mac, Windows
    Price: Free
    License: Proprietary

  • NitroGit

    Platforms: Windows
    Price: 20€/user / Free for non-commercial use
    License: Proprietary

  • GitFinder

    Platforms: Mac
    Price: $24.95
    License: Proprietary

  • Vershd

    Platforms: Linux, Mac, Windows
    Price: Free for personal use, otherwise $37
    License: Proprietary

  • GitUI

    Platforms: Linux, Mac, Windows
    Price: Free, but donations welcome
    License: MIT

  • PolyGit

    Platforms: iOS
    Price: Free with in-app purchases
    License: Proprietary

Sourcetree For Mac 10.13.6

There are other great GUI tools available as well. Have a look at the list of interfaces, frontends and tools in the Git Wiki.

Coments are closed

Recent News

  • Nova Golf
  • Avast SecureLine VPN For Mac
  • OneWaySync
  • Stocks Bonds Finance Calculator

Scroll to top