Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

OSX Using Beyond Compare as git difftool

When trying to launch Beyond Compare using git, I get this error:

The diff tool bc3 is not available as 'bcompare'

fatal: external diff died, stopping at plugins/PushPlugin.m

Set up diff tool:

$ git config --global diff.tool bc3

Try to compare directory:

$ git difftool plugins

Viewing (1/2): 'plugins/PushPlugin.m'
Launch 'bc3' [Y/n]: y
like image 220
scw Avatar asked Jul 02 '15 14:07

scw


People also ask

What is git Difftool?

git difftool is a Git command that allows you to compare and edit files between revisions using common diff tools. git difftool is a frontend to git diff and accepts the same options and arguments.


2 Answers

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

like image 145
scw Avatar answered Sep 19 '22 01:09

scw


According to official website: Scooter Software: Beyond Compare

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 Pro only 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

like image 28
Durja Avatar answered Sep 21 '22 01:09

Durja