Created
July 12, 2018 13:34
-
-
Save issuran/d77c7ef45296b5cbd3bc8abe0364e566 to your computer and use it in GitHub Desktop.
Changing mergetool tool to use kdiff3 on Mac
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
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
steps are now
brew update
brew tap homebrew/cask
brew cask install kdiff3