Araxis Merge Folder Comparison Report 0 2007-12-26 20:04:04 +0000 1 0 1 1 1 1 512 Folders - * 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 resources /Users/djn/Desktop/Test Folders/Test 3/apache-tomcat-5.5.17-src/container/catalina/src/share/org/apache/naming/ resources /Users/djn/Desktop/Test Folders/Test 3/jakarta-tomcat-4.1.31-src/catalina/src/share/org/apache/naming/ resources /Users/djn/Desktop/Test Folders/Test 3/jakarta-tomcat-5.0.30-src/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/ #000000 #FFFFFF Courier normal normal 8.250000pt none #A50000 #E8DEC3 Courier normal normal 8.250000pt none #A50000 #C9E8DD Courier normal normal 8.250000pt none #A50000 #E1C3E8 Courier normal normal 8.250000pt none #000000 #FFFFFF Courier normal normal 8.250000pt none #A50000 #E8DEC3 Courier normal normal 8.250000pt none #A50000 #C9E8DD Courier normal normal 8.250000pt none #A50000 #E1C3E8 Courier normal normal 8.250000pt none #000000 #FFFFFF Courier normal normal 8.250000pt none #A50000 #E8DEC3 Courier normal normal 8.250000pt none #A50000 #C9E8DD Courier normal normal 8.250000pt none #A50000 #E1C3E8 Courier normal normal 8.250000pt none