JetBrains/intellij-community — pull request #6 by iceGithub (2012-02-08 17:02:48+00:00)
Title: IDEA-69292 make merge possible from console

Commit makes possible to run merge tool from console.
Run format is:
/idea.sh merge /path/left.txt /path/right.txt /path/original.txt /path/result.txt