IngtelliJ has got some great diff and merge tools and I would love to use them standalone (of course with a licensed IntelliJ installed). I found this thread (http://www.jetbrains.net/devnet/message/5213505) that talks about diff. But what about merge? Is there a way to invoke merge tool standalone? It's the nicest tool I've seen with syntax highlighting and such. Thanks in advance everyone!