In my Source Tree "External Diff/Merge" settings, I have the following entries
Merge Tool: "D:\Program Files\IntelliJ IDEA Community Edition 12.1.2\bin\idea.bat"
Arguments: merge $LOCAL $REMOTE $MERGED
If I were to run the following command from the Windows command line, my merge tool (IntelliJ) would fire up normally (note that "a.txt", "b.txt", and "c.txt" are dummy filenames):
"D:\Program Files\IntelliJ IDEA Community Edition 12.1.2\bin\idea.bat" a.txt b.txt c.txt
However, in SourceTree, the merge tool will to fire up. Sometimes, I can even see IntelliJ running in my task manager, and I can see the files SourceTree generates for diffing. But the files will suddenly dissappear, the IntelliJ process dies, and nothing happens in SourceTree.
You will need to use a launcher script:
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.