Skip to content

Instantly share code, notes, and snippets.

@elijahmanor

elijahmanor/gist:b339317133fdc90687f661211b0f1e9d

Created October 30, 2019 15:42
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save elijahmanor/b339317133fdc90687f661211b0f1e9d to your computer and use it in GitHub Desktop.
Save elijahmanor/b339317133fdc90687f661211b0f1e9d to your computer and use it in GitHub Desktop.
Download ZIP
git difftool kdiff3
Raw
gistfile1.txt
* Download [`kdiff3`](https://sourceforge.net/projects/kdiff3/)
```
git config --global --add merge.tool kdiff3
git config --global --add mergetool.kdiff3.path "/Applications/kdiff3.app/Contents/MacOS/kdiff3"
git config --global --add mergetool.kdiff3.trustExitCode false
git config --global --add diff.guitool kdiff3
git config --global --add difftool.kdiff3.path "/Applications/kdiff3.app/Contents/MacOS/kdiff3"
git config --global --add difftool.kdiff3.trustExitCode false
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment