Using IDEA for Git merging and diffing

A cool bit of CLI trickery that James Humphrey shared with me. This allows you to use IDEA for diffing and merging via git’s mergetool and difftool commands. First, add IDEA to your path (everything is in Mac-speak here): Bash export INTELLIJ_HOME /Applications/IntelliJ IDEA 12.app/Contents/MacOS PATH=$IDEA_HOME $PATH Fish set INTELLIJ_HOME /Applications/IntelliJ IDEA 12.app/Contents/MacOS set PATH […]