SVN: use ancestry parameter for merge file (for IDEA-12035 SVN: "Resolve Text Conflic...