[chrisseaton]

> I have it configured as my git mergetool

How are you doing this? I haven't seen any merge tool, let alone a standalone one, in the JetBrains toolbox. What am I missing?

[cataphract]

You invoke it with "idea.sh merge <left> <right> <base> <out>". TBH, I don't think it's anything special; I've been using p4merge for years.

[anentropic]

By the steps here https://stackoverflow.com/a/47712453/202168