Produced by Araxis Merge on 5/25/2018 9:21:43 AM Central Daylight 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 | File | Last Modified |
|---|---|---|---|
| 1 | C:\AraxisMergeCompare\Pri_un\ZIP\DSM-cif\Direct Implementation\java\install\build\download\apache-tomcat-6.0.37.tar\apache-tomcat-6.0.37\bin\tomcat-native.tar\tomcat-native\tomcat-native-1.1.27-src\jni\examples\org\apache\tomcat\jni | Echo.properties | Sun Feb 3 10:40:02 2013 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\ZIP\DSM-cif\Direct Implementation\java\install\build\download\apache-tomcat-6.0.37.tar\apache-tomcat-6.0.37\bin\tomcat-native.tar\tomcat-native\tomcat-native-1.1.27-src\jni\examples\org\apache\tomcat\jni | Echo.properties | Thu May 24 19:39:08 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 1 | 32 |
| Changed | 1 | 2 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | # Licensed to the Ap ache Softw are Founda tion (ASF) under one or more | |
| 2 | # contribu tor licens e agreemen ts. See t he NOTICE file distr ibuted wit h | |
| 3 | # this wor k for addi tional inf ormation r egarding c opyright o wnership. | |
| 4 | # The ASF licenses t his file t o You unde r the Apac he License , Version 2.0 | |
| 5 | # (the "Li cense"); y ou may not use this file excep t in compl iance with | |
| 6 | # the Lice nse. You may obtain a copy of the Licen se at | |
| 7 | # | |
| 8 | # http ://www.apa che.org/li censes/LIC ENSE-2.0 | |
| 9 | # | |
| 10 | # Unless r equired by applicabl e law or a greed to i n writing, software | |
| 11 | # distribu ted under the Licens e is distr ibuted on an "AS IS" BASIS, | |
| 12 | # WITHOUT WARRANTIES OR CONDIT IONS OF AN Y KIND, ei ther expre ss or impl ied. | |
| 13 | # See the License fo r the spec ific langu age govern ing permis sions and | |
| 14 | # limitati ons under the Licens e. | |
| 15 | ||
| 16 | # Test por t used for echo serv er | |
| 17 | echo.port= PORT |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.