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.
| # | 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 |
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 |
No files were selected.
| 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 |
| Expression | Description |
|---|---|
^[ \t]*$ |
Blank lines |
|
|
0 |
|
||
|
|
1 |
|
Report 1 | |
|
|
0 |
|
||
|
|
0 |
|
||
|
|
0 |
|
||
|
|
0 |
|
||
|
|
0 |
|
||
|
|
0 |
|
||
|
|
0 |
|
||
|
|
0 |
|
||
|
|
0 |
|
||
|
|
0 |
|
||
|
|
0 |
|
||
|
|
0 |
|
||
|
|
0 |
|
||
|
|
0 |
|
||
|
|
0 |
|
||
|
|
0 |
|
||
|
|
1 |
|
Report 2 | |
|
|
11 |
|
Report 3 | |
|
|
6 |
|
Report 4 |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2008 Araxis Ltd (www.araxis.com). All rights reserved.