Created
February 14, 2014 06:49
-
-
Save unok/8996791 to your computer and use it in GitHub Desktop.
gitconfig for intellij merge tool
This file contains hidden or 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\\ 13.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\\ 13.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