Araxis Merge Folder Comparison Report

Produced by Araxis Merge on Mon Mar 6 16:03:35 2006 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

1. Folders compared

#	Location	Folder
1	C:\Merge Test Files\4.0.6\catalina\src\share\org\apache\catalina\	connector
2	C:\Merge Test Files\4.1.18\catalina\src\share\org\apache\catalina\	connector

2. Summary for all files

Between Folders 1 and 2
416 lines in 6 pairs of unchanged files
13297 lines in 8 pairs of changed files
77 lines in 3 inserted files
809 lines in 3 removed files

Description	Between Folders 1 and 2
Description	Lines	Text Blocks
Unchanged	6669	80
Changed	186	31
Inserted	259	35
Removed	816	7

3. Summary for selected files

No files were selected.

4. Comparison options

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	All differences in whitespace within lines are ignored
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
Include	Items matching `Files & Folders - *` 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

5. Active regular expressions

No regular expressions were active.

6. Comparison detail

http	0	http
DefaultHeaders.java	2	DefaultHeaders.java	Report 1
HttpConnector.java	17	HttpConnector.java	Report 2
HttpProcessor.java	18	HttpProcessor.java	Report 3
		LocalString_fr.properties	Report 4
LocalStrings.properties	0	LocalStrings.properties
LocalStrings_es.properties	0	LocalStrings_es.properties
SocketInputStream.java	2	SocketInputStream.java	Report 5
http10	0	http10
warp	0
Constants.java	1		Report 6
WarpResponse.java	1		Report 7
WarpSSLData.java	1		Report 8
Constants.java	4	Constants.java	Report 9
HttpConnector.java	10	HttpConnector.java	Report 10
HttpProcessor.java	6	HttpProcessor.java	Report 11
LocalStrings.properties	0	LocalStrings.properties
		LocalStrings_fr.properties	Report 12
LocalStrings_ja.properties	0	LocalStrings_ja.properties
			Report 13
Constants.java	0	Constants.java
HttpRequestBase.java	8	HttpRequestBase.java	Report 14
LocalStrings.properties	0	LocalStrings.properties
		LocalStrings_fr.properties	Report 15