I suspect this is a problem with my environment rather than a bug in RubyMine, but it's really annoying and I'm not sure how to fix it!
I'm running RubyMine 4.0.2 (and I've just tried the 4.5 RC as well) on Mac OS/X Lion with a git repo, and I seem to have lost the ability to show the diff/merge view, which is getting very frustrating. I'm currently looking at the result of a merge failure with a bunch of conflicts. RubyMine is clearly identifying the files with conflicts by showing the names in red. But whether I choose the VCS | Git | Resolve conflicts option from the menu bar or right-click on a file with a conflict and choose Git | Resolve Conflicts, nothing happens. There's no error I can see, the merge view simply fails to show up.
So has anyone seen this before? Is there any particular configuration file I can try clearing to see if it will restore my Resolve Conflicts view?
As a supplementary, has anyone experimented with configuring the Rubymine merge tool as the default git diff/merge viewer? Can it be run from the command-line on the Mac?
Any help appreciated.