Produced by Araxis Merge on Thu Oct 18 14:41:31 2007 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 Internet Explorer. For optimum results when printing this report, enable printing of background images and colours in your browser and use landscape orientation.
| # | Folder | Location |
|---|---|---|
| 1 | corporate_portal_templates_v2 | C:/jahia/template_diff/500/ |
| 2 | corporate_portal_templates_v2 | C:/jahia/jahia5.0.3_r18924/tomcat/webapps/jahia/jsp/jahia/templates/site1/ |
| Description | Between Folders 1 and 2 | ||
|---|---|---|---|
| Files | Blocks | Lines | |
| Unchanged | 49 | 63 | 8002 |
| Changed | 7 | 5 | 10 |
| Inserted | 0 | 0 | 0* |
| Removed | 0 | 2 | 5* |
| Note: Figures marked * relate only to changed and unchanged files; lines in inserted and removed files are not counted. | |||
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 | Only the files in the top level of the folders are compared |
| Whitespace | All differences in whitespace within lines are ignored |
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| Ignore | Files matching the pattern *.obj;*.o;*.cab;*.exe;*.dll;*.map;*.pch;*.idb;*.ncb;*.vcp;*.aps;*.res;*.sbr;*.bsc;*.ilk;*.pdb;*.ide;*.class;*.tlb;*.hlp;*.lib;*.exp;*.pdf;*.zip;*.jar;Debug/;Release/;WinDebug/;WinRel/;CVS/;RCS/;.svn/ are ignored |
| Include | Disabled |
| Unchanged files | Shown in the comparison detail |
| Timestamps and sizes | Not shown in the comparison detail |
| Change counts | Shown in the comparison detail |
No regular expressions were active.
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 1 | Report 1 | |||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 1 | Report 2 | |||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 1 | Report 3 | |||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 1 | Report 4 | |||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 1 | Report 5 | |||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 1 | Report 6 | |||
| 0 | ||||
| 1 | Report 7 | |||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 | ||||
| 0 |
Araxis Merge (but not this generated report) is Copyright © 1993-2003 Araxis Ltd (www.araxis.com). All rights reserved.
advsearch
advsearch.inc
calendar.jsp
blogs
corporate_portal_templates.gif
templates.xml
templates.xml