#IDEA-105541 fixed
IDEA-106496 Unnecessary warning after merge

*Idea opens conflict resolver automatically if conflicts detected.
Move prepareSecondRepository method to base hg test class