Re: svn commit: r1188313 [1/5] - in /tomcat/trunk/java: javax/el/ org/apache/catalina/authenticator/ org/apache/catalina/connector/ org/apache/catalina/core/ org/apache/catalina/deploy/ org/apache/cat

2011-10-25 Thread Konstantin Kolinko
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties?r1=1188313r2=1188312pathrev=1188313 The new value of webXml.mergeConflictOrder is wrong, it is concatenation of two values. It is the only glitch that I noted. Is your tool able to find properties

Re: svn commit: r1188313 [1/5] - in /tomcat/trunk/java: javax/el/ org/apache/catalina/authenticator/ org/apache/catalina/connector/ org/apache/catalina/core/ org/apache/catalina/deploy/ org/apache/cat

2011-10-25 Thread Mark Thomas
On 25/10/2011 12:06, Konstantin Kolinko wrote: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties?r1=1188313r2=1188312pathrev=1188313 The new value of webXml.mergeConflictOrder is wrong, it is concatenation of two values. It is the only glitch