EDIT: I got it to work after writing this post. But I thought I would post anyway as a reference for future. I was using $ instead of % in my bat!
I still can't get it to work with the subversion config though.
This suggests that I can use IDEA as an external diff:
I can't get it to work with SVN though (pressing the letter l from the command line when there is a conflict) .
I have SVN 1.7 installed and I am calling it from msysgit bash.
I have tried modifying $HOME/.subversion/config and %APPDATA%\Subversion\config and setting SVN_MERGE env variable but no luck.
The config doesn't get called when I modify it with
### Set merge-tool-cmd to the command used to invoke your external
### merging tool of choice. Subversion will pass 4 arguments to
### the specified command: base theirs mine merged
# merge-tool-cmd = merge_command
The SVN_MERGE works but all it does is open IDEA.
I have tried creating a bat file and setting that as the env variable.
It contains the following:
cd C:\tools\JetBrains\IntelliJ IDEA Community Edition 126.232\bin
idea.exe merge %1 %2 %3 %4
Is there a proper way to do this?
Can you add this to the help example