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

9.1 Files compared

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

9.2 Comparison summary

DescriptionBetween
Files 1 and 2
BlocksLines
Unchanged152
Changed00
Inserted00
Removed00

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

9.4 Active regular expressions

No regular expressions were active.

9.5 Comparison detail

1 // 1 //
2 // COPYRIGHT 2 // COPYRIGHT
3 // 3 //
4 // Copyright © 1999-2002 Araxis Ltd. All rights reserved except as expressly 4 // Copyright © 1999-2002 Araxis Ltd. All rights reserved except as expressly
5 // granted below. 5 // granted below.
6 // 6 //
7 // You are hereby granted a limited licence to use and modify this source code 7 // You are hereby granted a limited licence to use and modify this source code
8 // solely for the purposes of: 8 // solely for the purposes of:
9 // 9 //
10 //    i) tailoring Araxis Merge to suit your requirements; 10 //    i) tailoring Araxis Merge to suit your requirements;
(32 unchanged lines omitted)
43  43 
44 // TODO: reference additional headers your program requires here 44 // TODO: reference additional headers your program requires here
45  45 
46 #include <comdef.h> 46 #include <comdef.h>
47 #import <merge.tlb> 47 #import <merge.tlb>
48  48 
49 //{{AFX_INSERT_LOCATION}} 49 //{{AFX_INSERT_LOCATION}}
50 // Microsoft Visual C++ will insert additional declarations immediately before the previous line. 50 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
51  51 
52 #endif // !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_) 52 #endif // !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)