6. Araxis Merge File Comparison Report

Produced by Araxis Merge on Sat Apr 12 16:07:31 2003. 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 Internet Explorer. For optimum results when printing this report, enable printing of background images and colours in your browser and use landscape orientation.

6.1 Files compared

#FileLocationLast Modified
1ReadMe.txtc:\scm\dev\Software\Products\merge\6.0\Merge\compareMon Mar 17 01:01:18 2003 UTC
2ReadMe.txtc:\scm\dev\Software\Products\merge\6.5\Merge\compareTue Apr 8 00:52:35 2003 UTC

6.2 Comparison summary

DescriptionBetween
Files 1 and 2
BlocksLines
Unchanged135
Changed00
Inserted00
Removed00

6.3 Comparison options

WhitespaceAll differences in whitespace within lines are ignored
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersHidden in comparison detail

6.4 Active regular expressions

No regular expressions were active.

6.5 Comparison detail

1 ======================================================================== 1 ========================================================================
2        WIN32 APPLICATION : compare 2        WIN32 APPLICATION : compare
3 ======================================================================== 3 ========================================================================
4  4 
5  5 
6 AppWizard has created this compare application for you.   6 AppWizard has created this compare application for you.  
7  7 
8 This file contains a summary of what you will find in each of the files that 8 This file contains a summary of what you will find in each of the files that
9 make up your compare application. 9 make up your compare application.
10  10 
(15 unchanged lines omitted)
26  26 
27  27 
28 ///////////////////////////////////////////////////////////////////////////// 28 /////////////////////////////////////////////////////////////////////////////
29 Other notes: 29 Other notes:
30  30 
31 AppWizard uses "TODO:" to indicate parts of the source code you 31 AppWizard uses "TODO:" to indicate parts of the source code you
32 should add to or customize. 32 should add to or customize.
33  33 
34  34 
35 ///////////////////////////////////////////////////////////////////////////// 35 /////////////////////////////////////////////////////////////////////////////