Setting up an IntelliJ IDE as merge tool Windows
suggest change[merge]
tool = intellij
[mergetool "intellij"]
cmd = cmd \"/C D:\\workspace\\tools\\symlink\\idea\\bin\\idea.bat 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")\"
keepBackup = false
keepbackup = false
trustExitCode = true
The one gotcha here is that this cmd
property does not accept any weird characters in the path. If your IDE’s install location has weird characters in it (e.g. it’s installed in Program Files (x86)
, you’ll have to create a symlink
Found a mistake? Have a question or improvement idea?
Let me know.
Table Of Contents