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

7.1 Files compared

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

7.2 Comparison summary

DescriptionBetween
Files 1 and 2
BlocksLines
Unchanged114
Changed00
Inserted00
Removed00

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

7.4 Active regular expressions

No regular expressions were active.

7.5 Comparison detail

1 //{{NO_DEPENDENCIES}} 1 //{{NO_DEPENDENCIES}}
2 // Microsoft Visual C++ generated include file. 2 // Microsoft Visual C++ generated include file.
3 // Used by compare.rc 3 // Used by compare.rc
4  4 
5 // Next default values for new objects 5 // Next default values for new objects
6 //  6 // 
7 #ifdef APSTUDIO_INVOKED 7 #ifdef APSTUDIO_INVOKED
8 #ifndef APSTUDIO_READONLY_SYMBOLS 8 #ifndef APSTUDIO_READONLY_SYMBOLS
9 #define _APS_NEXT_RESOURCE_VALUE        101 9 #define _APS_NEXT_RESOURCE_VALUE        101
10 #define _APS_NEXT_COMMAND_VALUE         40001 10 #define _APS_NEXT_COMMAND_VALUE         40001
11 #define _APS_NEXT_CONTROL_VALUE         1001 11 #define _APS_NEXT_CONTROL_VALUE         1001
12 #define _APS_NEXT_SYMED_VALUE           101 12 #define _APS_NEXT_SYMED_VALUE           101
13 #endif 13 #endif
14 #endif 14 #endif