Source Tree: Custom merge tool not launching

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
Community showcase
Published Oct 23, 2018 in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

719 views 3 2
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you