Skip to content

Instantly share code, notes, and snippets.

@gordwilling

gordwilling/gist:f8897e8cd82f58b28b44d875778892fa

Created June 20, 2016 15:46
Show Gist options
  • Save gordwilling/f8897e8cd82f58b28b44d875778892fa to your computer and use it in GitHub Desktop.
Save gordwilling/f8897e8cd82f58b28b44d875778892fa to your computer and use it in GitHub Desktop.
Download ZIP
Configure git to use IntelliJ IDEA as the diff and merge tool on Windows
Raw
gistfile1.txt
[merge]
tool = intellij
[mergetool "intellij"]
cmd = "C:/Program Files (x86)/JetBrains/IntelliJ IDEA 2016.1/bin/idea64.exe" merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
trustExitCode = true
[diff]
tool = intellij
[difftool "intellij"]
cmd = "C:/Program Files (x86)/JetBrains/IntelliJ IDEA 2016.1/bin/idea64.exe" diff \"$LOCAL\" \"$REMOTE\"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment