7. Araxis Merge File Comparison Report

Produced by Araxis Merge on Fri Nov 21 17:21:37 2008 UTC. 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 Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

7.1 Files compared

# Location File Last Modified
1 C:\Documents and Settings\allums\Desktop\2008.1.20396.b\Formats\Microsoft HTML Help 1.x\Pages template.hhp Wed May 10 19:55:12 2006 UTC
2 C:\Documents and Settings\allums\Desktop\2008.2.20597.p2\Formats\Microsoft HTML Help 1.x\Pages template.hhp Fri Jun 27 16:58:12 2008 UTC

7.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 2 68
Changed 1 2
Inserted 0 0
Removed 0 0

7.3 Comparison options

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 ignored
CR/LF characters Not shown in the comparison detail

7.4 Active regular expressions

Expression Description
\$(Author|Date|Header|Id|Locker|Name|RCSfile|Revision|Source|State):[^$]*\$ CVS comments

7.5 Comparison detail

1   [OPTIONS]   1   [OPTIONS]
2   Binary TOC =$BinaryTO C;   2   Binary TOC =$BinaryTO C;
3   Binary Ind ex=$Binary Index;   3   Binary Ind ex=$Binary Index;
4   Compatibil ity=1.1 or  later   4   Compatibil ity=1.1 or  later
5   Compiled f ile=$Compi ledFile;   5   Compiled f ile=$Compi ledFile;
6   Contents f ile=$TOCNa me;   6   Contents f ile=$TOCNa me;
7   Default Wi ndow=TriPa ne   7   Default Wi ndow=TriPa ne
8   Default to pic=$Defau ltTopic;   8   Default to pic=$Defau ltTopic;
9   Display co mpile prog ress=No   9   Display co mpile prog ress=No
10   Full-text  search=Yes   10   Full-text  search=Yes
11   ;Full text  search st op list fi le=search. stp   11   ;Full text  search st op list fi le=search. stp
12   Index file =$IndexNam e;   12   Index file =$IndexNam e;
13   Language=$ LCID;   13   Language=$ LCID;
14   Title=$Tit le;   14   Title=$Tit le;
15     15  
16   [WINDOWS]   16   [WINDOWS]
17   TriPane=," $TOCName;" ,"$IndexNa me;","$Def aultTopic; ","$HomePa ge;",,,,,0 x3520,,0x3 006,,,,,,, ,0   17   TriPane=," $TOCName;" ,"$IndexNa me;","$Def aultTopic; ","$HomePa ge;",,,,,0 x3520,,0x3 006,,,,,,, ,0
18   $WindowDef inition;   18   $WindowDef inition;
19     19  
20   [FILES]   20   [FILES]
21   $Files;   21   $Files;
22     22  
23   [MERGE FIL ES]   23   [MERGE FIL ES]
24   $MergeFile s;   24   $MergeFile s;
25     25  
26   [ALIAS]   26   [ALIAS]
27   $Aliases;   27   $Aliases;
28     28  
29   [MAP]   29   [MAP]
30   $MapFile
;
  30   $MapFile s ;
31     31  
32   [TEXT POPU PS]   32   [TEXT POPU PS]
33   $WhatIsThi sFiles;   33   $WhatIsThi sFiles;
34     34  
35   [INFOTYPES ]   35   [INFOTYPES ]