Araxis Merge Folder Comparison Report

Produced by Araxis Merge on 2016-08-05 08:06:45 +0000. See 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.

1. Folders compared

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

2. Summary for all files

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
DescriptionBetween Folders 1 and 2
Lines (Folder 1)Lines (Folder 2)Lines (Total)Text Blocks

3. Summary for selected files

No files were selected.

4. Comparison options

Comparison methodFiles 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
DepthAll files in the folder hierarchy are compared
WhitespaceDifferences in whitespace are significant
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are significant
IncludeItems matching Folders - ** are included in the comparison
IncludeItems matching Files - ** are included in the comparison
IgnoreItems matching Files - ._* are not included in the comparison
Unchanged filesShown in the comparison detail
Timestamps and sizesNot shown in the comparison detail
Change countsShown in the comparison detail

5. Active regular expressions

No regular expressions were active.

6. Comparison detail

  Report 1
  Report 2
  Report 3
  Report 4
  Report 5
  Report 6
  Report 7
  Report 8
  Report 9
  Report 10
  Report 11
  Report 12
  Report 13
  Report 14
  Report 15
  Report 16
  Report 17
  Report 18
  Report 19
  Report 20
  Report 21
  Report 22
  Report 23