[sushisource]

I dunno if you are aware, but you can use the diff/merge standalone. My gift to you:

     [mergetool "intellij"]
     cmd = 'intellij-idea-ultimate-edition' merge "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
     trustExitCode = true