Produced by Araxis Merge on 2016-08-05 09:21:34 +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 | File | Last Modified |
|---|---|---|---|
| 1 | 2016-08-05 09:21:34 +0000 | ||
| 2 | /Merge Test Files/jakarta-tomcat-4.1.18-src/catalina/src/share/org/apache/catalina/connector/http10 | LocalStrings_fr.properties | 2002-12-19 13:49:40 +0000 |
| 3 | /Merge Test Files/jakarta-tomcat-4.1.24-src/catalina/src/share/org/apache/catalina/connector/http10 | LocalStrings_fr.properties | 2003-03-19 09:18:36 +0000 |
| Note: Merge considers the second file to be the common ancestor of the others. | |||
| Description | Between Files 1 and 2 | Between Files 2 and 3 | Relative to Common Ancestor | |||
|---|---|---|---|---|---|---|
| Text Blocks | Lines | Text Blocks | Lines | Text Blocks | Lines | |
| Unchanged | 0 | 0 | 1 | 40 | ||
| Changed | 0 | 0 | 0 | 0 | 0 | 0 |
| Inserted | 1 | 20 | 0 | 0 | 0 | 0 |
| Removed | 0 | 0 | 0 | 0 | 1 | 20 |
| Note: An automatic merge would leave 0 conflict(s). | ||||||
| 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 |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | httpConnector.alreadyInitialized==Le connecteur HTTP a d￩j￠ ￩t￩ initialis￩ | 1 | httpConnector.alreadyInitialized==Le connecteur HTTP a d￩j￠ ￩t￩ initialis￩ | |||||||
| 2 | httpConnector.alreadyStarted=Le connecteur HTTP a d￩j￠ ￩t￩ d￩marr￩ | 2 | httpConnector.alreadyStarted=Le connecteur HTTP a d￩j￠ ￩t￩ d￩marr￩ | |||||||
| 3 | httpConnector.allAddresses=Ouverture du serveur socket sur toutes les adresses IP de l''hte | 3 | httpConnector.allAddresses=Ouverture du serveur socket sur toutes les adresses IP de l''hte | |||||||
| 4 | httpConnector.anAddress=Ouverture du serveur socket pour l''hte ￠ l''adresse IP {0} | 4 | httpConnector.anAddress=Ouverture du serveur socket pour l''hte ￠ l''adresse IP {0} | |||||||
| 5 | httpConnector.noAddress=Aucune adresse IP de l''hte correspondant ￠ {0}, ouverture sur toutes les adresses | 5 | httpConnector.noAddress=Aucune adresse IP de l''hte correspondant ￠ {0}, ouverture sur toutes les adresses | |||||||
| 6 | httpConnector.noProcessor=Aucun processeur (processor) disponible, rejet de cette connexion | 6 | httpConnector.noProcessor=Aucun processeur (processor) disponible, rejet de cette connexion | |||||||
| 7 | httpConnector.notStarted=Le connecteur HTTP n''a pas encore ￩t￩ d￩marr￩ | 7 | httpConnector.notStarted=Le connecteur HTTP n''a pas encore ￩t￩ d￩marr￩ | |||||||
| 8 | httpConnector.starting=D￩marrage du thread de fond (background thread) | 8 | httpConnector.starting=D￩marrage du thread de fond (background thread) | |||||||
| 9 | httpConnector.stopping=Arr￪t du thread de fond (background thread) | 9 | httpConnector.stopping=Arr￪t du thread de fond (background thread) | |||||||
| 10 | httpProcessor.alreadyStarted=Le processeur HTTP a d￩j￠ ￩t￩ d￩marr￩ | 10 | httpProcessor.alreadyStarted=Le processeur HTTP a d￩j￠ ￩t￩ d￩marr￩ | |||||||
| 11 | httpProcessor.notStarted=Le processeur HTTP n''a pas encore ￩t￩ d￩marr￩ | 11 | httpProcessor.notStarted=Le processeur HTTP n''a pas encore ￩t￩ d￩marr￩ | |||||||
| 12 | httpProcessor.parseHeaders.contentLength=Ent￪te de taille de contenu (Content-Length) invalide | 12 | httpProcessor.parseHeaders.contentLength=Ent￪te de taille de contenu (Content-Length) invalide | |||||||
| 13 | httpProcessor.parseHeaders.colon=Format d''ent￪te HTTP invalide | 13 | httpProcessor.parseHeaders.colon=Format d''ent￪te HTTP invalide | |||||||
| 14 | httpProcessor.parseHeaders.portNumber=Num￩ro de port TCP/IP invalide dans l''ent￪te 'Host' | 14 | httpProcessor.parseHeaders.portNumber=Num￩ro de port TCP/IP invalide dans l''ent￪te 'Host' | |||||||
| 15 | httpProcessor.parseRequest.method=M￩thode de requ￪te HTTP absente | 15 | httpProcessor.parseRequest.method=M￩thode de requ￪te HTTP absente | |||||||
| 16 | httpProcessor.parseRequest.read=Ligne de requ￪te HTTP absente | 16 | httpProcessor.parseRequest.read=Ligne de requ￪te HTTP absente | |||||||
| 17 | httpProcessor.parseRequest.uri=URI de requ￪te HTTP absente | 17 | httpProcessor.parseRequest.uri=URI de requ￪te HTTP absente | |||||||
| 18 | httpProcessor.start=Le processeur HTTP a d￩j￠ ￩t￩ d￩marr￩ | 18 | httpProcessor.start=Le processeur HTTP a d￩j￠ ￩t￩ d￩marr￩ | |||||||
| 19 | httpProcessor.starting=D￩marrage du thread de fond (background thread) | 19 | httpProcessor.starting=D￩marrage du thread de fond (background thread) | |||||||
| 20 | httpProcessor.stopping=Arr￪t du thread de fond (background thread) | 20 | httpProcessor.stopping=Arr￪t du thread de fond (background thread) |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.