Araxis Merge Folder Comparison Report 0 2016-08-05 08:40:41 +0000 mac 0 0 0 1 1 0 1 512 Folders - ** Files - ** Files - ._* 0 1 1 0 ^[ \t]*$ Blank lines [ \t]*//[^"]*$ C++ comments ^[ \t]*//.*\$(Date|Archive|Author|Header|JustDate|Modtime|Revision|Workfile):.*\$.*$ SourceSafe comments ^[ \t]*//(:(Header|Source):|.*Generated.*Genitor).*\$ Genitor comments \$(Archive|Author|Date|Header|JustDate|Logfile|Modtime|Revision|Workfile):[^$]*\$ SourceSafe keywords ^[ \t]*'.*$ Visual Basic comments \$(Author|Date|Header|Id|Locker|Name|RCSfile|Revision|Source|State):[^$]*\$ CVS comments \$(ACident|ACheader|AClog|ACpart|ACversion|Author|Date|Header|Line|Locker|Log|Revision|Smsfile|Smspath|Today|Vcfile|Vcpath|Workfile):?[^$]*\$ AllChange keywords connector /Merge Test Files/jakarta-tomcat-4.0.6-src/catalina/src/share/org/apache/catalina/ connector /Merge Test Files/jakarta-tomcat-4.1.18-src/catalina/src/share/org/apache/catalina/ connector /Merge Test Files/jakarta-tomcat-4.1.24-src/catalina/src/share/org/apache/catalina/ #000000 #FFFFFF Courier normal normal 8.250000pt none #800000 #F3E6D8 Courier normal normal 8.250000pt none #800000 #D1E8CF Courier normal normal 8.250000pt none #800000 #DACDE6 Courier normal normal 8.250000pt none #000000 #FFFFFF Courier normal normal 8.250000pt none #800000 #F3E6D8 Courier normal normal 8.250000pt none #800000 #D1E8CF Courier normal normal 8.250000pt none #800000 #DACDE6 Courier normal normal 8.250000pt none #000000 #FFFFFF Courier normal normal 8.250000pt none #800000 #F3E6D8 Courier normal normal 8.250000pt none #800000 #D1E8CF Courier normal normal 8.250000pt none #800000 #DACDE6 Courier normal normal 8.250000pt none