Araxis Merge Folder Comparison Report

Produced by Araxis Merge on Tue Jul 6 14:19:50 2010 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.

1. Folders compared

# Location Folder
1 C:\Users\greenbarn2010\Documents\websites\ccp8\dev\8.0.0\beta-1\saved\khxc\skins\ ClickCartPro
2 C:\Users\greenbarn2010\Documents\websites\ccp8\dev\XCS001\prof-changed\xcs\skins\ ClickCartPro

2. Summary for all files

Line counts exclude files larger than 512 KB. To include them, uncheck the Compare byte-by-byte for files larger than 512 KB option on the Folder Comparisons option page.

Between Folders 1 and 2
2772 lines in
13 pairs of unchanged files
2802 lines in
4 pairs of changed files
No inserted files
No removed files
Description Between Folders 1 and 2
Lines (Folder 1) Lines (Folder 2) Lines (Total) Text Blocks
Unchanged 2728 2728 5456 35
Changed 10 17 27 10
Inserted 0 90 90 8
Removed 1 0 1 1

3. Summary for selected files

No files were selected.

4. Comparison options

Comparison method Files smaller than 512 KB are compared using the configured comparison rules to determine whether they are identical. For larger files, a faster byte-by-byte comparison is performed
Depth All files in the folder hierarchy are compared
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
Include Items matching Files & Folders - * are included in the comparison
Unchanged files Shown in the comparison detail
Timestamps and sizes Not shown in the comparison detail
Change counts Shown in the comparison detail

5. Active regular expressions

Expression Description
^[ \t]*$ Blank lines

6. Comparison detail

css
 0  
css
  
all.css
 1  
all.css
  Report 1
default.html
 0  
default.html
  
index.html
 0  
index.html
  
install
 0  
install
  
data_khxc_modules_0.xml
 0  
data_khxc_modules_0.xml
  
default.html
 0  
default.html
  
index.html
 0  
index.html
  
media
 0  
media
  
default.html
 0  
default.html
  
index.html
 0  
index.html
  
menu_arrow.png
 0  
menu_arrow.png
  
scripts
 0  
scripts
  
default.html
 0  
default.html
  
index.html
 0  
index.html
  
scripts.js
 0  
scripts.js
  
default.html
 0  
default.html
  
index.html
 0  
index.html
  
print.php
 1  
print.php
  Report 2
skin.php
 11  
skin.php
  Report 3
skinfunc.php
 6  
skinfunc.php
  Report 4