IDEA-123647 Mercurial merge fail

*parse choices from message if there are no choices at all (see promptchoice method in mercurial ui.py)
IDEA-122856 Hard to catch layout delimiter in portrait mode
IDEA-123803 Popup goes behind its parent dialog for multiline editor
IDEA-123691 Minor project wizard edits: project type list refactored