Using Beyond Compare with Git

---
title: Using Beyond Compare with Version Control Systems
subtitle: Beyond Compare can be configured as the external diff and merge utility in Git.
author: Jon LaBelle
date: May 14, 2024
source: https://www.scootersoftware.com/kb/vcs
snippet: https://jonlabelle.com/snippets/view/markdown/using-beyond-compare-with-git
notoc: false
---

## Install command line tools

You can install the command line tools from the File menu, **Install command line tools**.

- `/usr/local/bin/bcomp`: Launches comparison and waits for it to complete.
- `/usr/local/bin/bcompare`: Launches comparison and returns immediately.

## Git config

### macOS

#### Diff

```console
[diff]
    tool = bcomp

[difftool]
    prompt = false

[difftool "bcomp"]
    trustExitCode = true
    cmd = /usr/local/bin/bcomp \"$LOCAL\" \"$REMOTE\"
```

> To launch a diff in Beyond Compare, run: `git difftool file.ext`

#### Merge

```console
[merge]
    tool = bcomp

[mergetool]
    prompt = false

[mergetool "bcomp"]
    trustExitCode = true
    cmd = /usr/local/bin/bcomp \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
```

> To launch a 3-way merge in Beyond Compare, run: `git mergetool file.ext`

#### References

- [Using Beyond Compare with Version Control Systems \(macOS\)](https://www.scootersoftware.com/kb/vcs_osx#git)