Produced by Araxis Merge on 2016-08-05 08:06:45 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | Folder |
|---|---|---|
| 1 | /Merge Test Files/jakarta-tomcat-4.0.6-src/catalina/src/share/org/apache/catalina/ | connector |
| 2 | /Merge Test Files/jakarta-tomcat-4.1.18-src/catalina/src/share/org/apache/catalina/ | connector |
Line counts exclude files larger than 512 KB. To include them, uncheck the Compare byte-by-byte for files larger than 512 KB option on the Folder Comparisons > Method preference page.
Line count statistics are not available for inserted and removed files. To enable them, select Gather line-count statistics for inserted and removed files on the Folder Comparisons > Scan preference page.
| Between Folders 1 and 2 |
|---|
| 294 lines in 5 pairs of unchanged files |
| 15341 lines in 16 pairs of changed files |
| 2 inserted files |
| No removed files |
| Description | Between Folders 1 and 2 | |||
|---|---|---|---|---|
| Lines (Folder 1) | Lines (Folder 2) | Lines (Total) | Text Blocks | |
| Unchanged | 7620 | 7620 | 15240 | 102 |
| Changed | 86 | 168 | 254 | 46 |
| Inserted | 0 | 126 | 126 | 32 |
| Removed | 15 | 0 | 15 | 6 |
No files were selected.
| Comparison method | Files smaller than 512 KB are compared using the configured comparison rules to determine whether they are identical. For larger files, a faster byte-by-byte comparison is performed |
|---|---|
| Depth | All files in the folder hierarchy are compared |
| Whitespace | Differences in whitespace are significant |
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are significant |
| Include | Items matching Folders - ** are included in the comparison |
| Include | Items matching Files - ** are included in the comparison |
| Ignore | Items matching Files - ._* are not included in the comparison |
| Unchanged files | Shown in the comparison detail |
| Timestamps and sizes | Not shown in the comparison detail |
| Change counts | Shown in the comparison detail |
No regular expressions were active.
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.