Created
February 17, 2015 14:33
-
-
Save chrisfsmith/7a7ec53e57317e199a3b to your computer and use it in GitHub Desktop.
Git mergetool and difftool config for IntelliJ. See https://www.jetbrains.com/idea/help/running-intellij-idea-as-a-diff-or-merge-command-line-tool.html
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
| [merge] | |
| tool = intellij | |
| [mergetool "intellij"] | |
| cmd = /Applications/IntelliJ\\ IDEA\\ 14.app/Contents/MacOS/idea merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED") | |
| trustExitCode = true | |
| [diff] | |
| tool = intellij | |
| [difftool "intellij"] | |
| cmd = /Applications/IntelliJ\\ IDEA\\ 14.app/Contents/MacOS/idea diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment