Forked from gordwilling/gist:f8897e8cd82f58b28b44d875778892fa
Last active
April 24, 2019 06:04
-
-
Save TomMannson/e578f5bdb96524217d479311de6ba393 to your computer and use it in GitHub Desktop.
Configure git to use IntelliJ IDEA as the diff and merge tool on Windows
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 = C:/Program\\ Files/Android/Android\\ Studio/bin/studio64.exe merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\" | |
| [diff] | |
| tool = intellij | |
| [difftool "intellij"] | |
| cmd = C:/Program\\ Files/Android/Android\\ Studio/bin/studio64.exe diff \"$LOCAL\" \"$REMOTE\" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment