2. Araxis Merge File Comparison Report

Produced by Araxis Merge on Sat Apr 12 16:07:30 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.

2.1 Files compared

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

2.2 Comparison summary

DescriptionBetween
Files 1 and 2
BlocksLines
Unchanged1111
Changed00
Inserted00
Removed00

2.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

2.4 Active regular expressions

No regular expressions were active.

2.5 Comparison detail

1 // Microsoft Visual C++ generated resource script. 1 // Microsoft Visual C++ generated resource script.
2 // 2 //
3 #include "resource.h" 3 #include "resource.h"
4  4 
5 #define APSTUDIO_READONLY_SYMBOLS 5 #define APSTUDIO_READONLY_SYMBOLS
6 ///////////////////////////////////////////////////////////////////////////// 6 /////////////////////////////////////////////////////////////////////////////
7 // 7 //
8 // Generated from the TEXTINCLUDE 2 resource. 8 // Generated from the TEXTINCLUDE 2 resource.
9 // 9 //
10 #include "afxres.h" 10 #include "afxres.h"
(91 unchanged lines omitted)
102 #ifndef APSTUDIO_INVOKED 102 #ifndef APSTUDIO_INVOKED
103 ///////////////////////////////////////////////////////////////////////////// 103 /////////////////////////////////////////////////////////////////////////////
104 // 104 //
105 // Generated from the TEXTINCLUDE 3 resource. 105 // Generated from the TEXTINCLUDE 3 resource.
106 // 106 //
107  107 
108  108 
109 ///////////////////////////////////////////////////////////////////////////// 109 /////////////////////////////////////////////////////////////////////////////
110 #endif    // not APSTUDIO_INVOKED 110 #endif    // not APSTUDIO_INVOKED
111  111