Produced by Araxis Merge on 11/20/2017 2:15:51 PM GMT Standard Time. 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 | C:\Merge Test Files\8.0.47\java\org\apache\ | catalina | |
| 2 | C:\Merge Test Files\8.5.23\java\org\apache\ | catalina | |
| 3 | C:\Merge Test Files\9.0.1\java\org\apache\ | catalina | |
| Note: Merge considers the second folder to be the common ancestor of the others. | |||
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 option page.
| Between Folders 1 and 2 | Between Folders 2 and 3 | Between Folders 1 and 3 | Relative to Common Ancestor |
|---|---|---|---|
| 932 lines in 6 pairs of unchanged files |
7586 lines in 20 pairs of unchanged files |
560 lines in 5 pairs of unchanged files |
5 unchanged files |
| 10237 lines in 13 pairs of changed files |
6420 lines in 7 pairs of changed files |
10576 lines in 14 pairs of changed files |
14 changed files |
| 1297 lines in 8 inserted files |
No inserted files | 1300 lines in 8 inserted files |
4 inserted files |
| 4 removed files | No removed files | 4 removed files | 8 removed files |
| Description | Between Folders 1 and 2 | |||
|---|---|---|---|---|
| Lines (Folder 1) | Lines (Folder 2) | Lines (Total) | Text Blocks | |
| Unchanged | 5127 | 5127 | 10254 | 187 |
| Changed | 286 | 302 | 588 | 104 |
| Inserted | 0 | 292 | 292 | 35 |
| Removed | 35 | 0 | 35 | 29 |
| Description | Between Folders 2 and 3 | |||
|---|---|---|---|---|
| Lines (Folder 2) | Lines (Folder 3) | Lines (Total) | Text Blocks | |
| Unchanged | 6949 | 6949 | 13898 | 67 |
| Changed | 35 | 34 | 69 | 26 |
| Inserted | 0 | 5 | 5 | 5 |
| Removed | 34 | 0 | 34 | 9 |
| Description | Between Folders 1 and 3 | |||
|---|---|---|---|---|
| Lines (Folder 1) | Lines (Folder 3) | Lines (Total) | Text Blocks | |
| Unchanged | 5100 | 5100 | 10200 | 213 |
| Changed | 307 | 323 | 630 | 123 |
| Inserted | 0 | 265 | 265 | 37 |
| Removed | 41 | 0 | 41 | 34 |
No files were selected.
| Comparison method | Files are compared using the configured comparison rules to determine whether they are identical |
|---|---|
| Depth | All files in the folder hierarchy are compared |
| Whitespace | Consecutive whitespace is treated as a single space |
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| Include | Items matching Folders - ** are included in the comparison |
| Include | Items matching Files - ** are 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–2017 Araxis Ltd (www.araxis.com). All rights reserved.