I get:
$ git difftool
fatal: bad config file line 69 in c:/Users/eturley/.gitconfig
Line 69 is:
cmd = cmd.exe //c "\"C:\Program Files (x86)\JetBrains\IntelliJ IDEA 12.1.4\bin\idea.bat\" merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
So I try to check it by running this in git bash:
$ cmd.exe //c "\"C:\Program Files (x86)\JetBrains\IntelliJ IDEA 12.1.4\bin\idea.bat\" diff DmfsException.java DmfsException1.java"
'\"C:\Program Files (x86)\JetBrains\IntelliJ IDEA 12.1.4\bin\idea.bat\"' is not recognized as an internal or external command, operable program or batch file.
It all seems to look right for me - yet doesn't work. Any suggestions?
ANSWER:
Turns out I had to change mine to reference "idea.exe" instead of "idea.bat".
I get:
$ git difftool
fatal: bad config file line 69 in c:/Users/eturley/.gitconfig
Line 69 is:
cmd = cmd.exe //c "\"C:\Program Files (x86)\JetBrains\IntelliJ IDEA 12.1.4\bin\idea.bat\" merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
So I try to check it by running this in git bash:
$ cmd.exe //c "\"C:\Program Files (x86)\JetBrains\IntelliJ IDEA 12.1.4\bin\idea.bat\" diff DmfsException.java DmfsException1.java"
'\"C:\Program Files (x86)\JetBrains\IntelliJ IDEA 12.1.4\bin\idea.bat\"' is not recognized as an internal or external command, operable program or batch file.
It all seems to look right for me - yet doesn't work. Any suggestions?
ANSWER:
Turns out I had to change mine to reference "idea.exe" instead of "idea.bat".