Skip to content

Instantly share code, notes, and snippets.

@issuran

issuran/Using kdiff3

Created July 12, 2018 13:34
Show Gist options
  • Save issuran/d77c7ef45296b5cbd3bc8abe0364e566 to your computer and use it in GitHub Desktop.
Save issuran/d77c7ef45296b5cbd3bc8abe0364e566 to your computer and use it in GitHub Desktop.
Download ZIP
Changing mergetool tool to use kdiff3 on Mac
Raw
Using kdiff3
The list of supported tools
$ git mergetool --tool-help
Setting kdiff3 as mergetool tool
$ git config --global merge.tool kdiff3
In case you want to config diff.tool
$ git config --global diff.tool kdiff3
If kdiff3 is not in your PATH environment also do
$ git config --global mergetool.kdiff3.path /Applications/kdiff3.app/Contents/MacOS/kdiff3
@issuran
Copy link
Author

issuran commented Jul 25, 2018

git mergetool --tool=kdiff3

@issuran
Copy link
Author

issuran commented Jul 25, 2018

Good to know:

  • How to install kdiff3 on Mac using Brew in two simple commands ( one at a time )

brew update
brew tap caskroom/cask
brew cask install kdiff3

@fastfading
Copy link

brew tap caskroom/cask
Updating Homebrew...
Error: caskroom/cask was moved. Tap homebrew/cask-cask instead.

@duttonw
Copy link

duttonw commented Aug 27, 2020

steps are now
brew update
brew tap homebrew/cask
brew cask install kdiff3

@dansbrazil
Copy link

Here I had to use:

brew update
brew tap homebrew/cask
brew install --cask kdiff3

That's the command recommended by Homebrew

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment