SVN: use ancestry parameter for merge file (for IDEA-12035 SVN: "Resolve Text Conflic...
tree1abaf606f4ab54ed6b355f157015ba4c1190191b
drwxr-xr-x - RegExpSupport
drwxr-xr-x - plugins