IDEA-123647 Mercurial merge fail

*parse choices from message if there are no choices at all (see promptchoice method in mercurial ui.py)
(cherry picked from commit 6f6e2c0)
ruby plugin 6.5.0.20140312 and 6.5.0.20140314 aren't compatible with slim