Source Tree: Custom merge tool not launching

Eric Liebowitz August 14, 2013

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.

1 answer

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events