--- a/Tools__ChangeSetDiffTool.st	Thu Apr 04 01:43:18 2013 +0100
+++ b/Tools__ChangeSetDiffTool.st	Thu Apr 04 19:06:16 2013 +0100
@@ -39,7 +39,7 @@
 		hasDiffsetHolder mergeSavedHolder canSaveHolder
 		autoMoveToNextConflictHolder textDiff2App textDiff3App list1App
 		list2App alreadyWarnedAboutUnsavedMerge labelSpecHolder
-		labelsView navigatorAndDiffPanelView'
+		labelsView navigatorAndDiffPanelView codeAspectHolder'
 	classVariableNames:'LastDiffInfo AutoMoveToNextConflict'
 	poolDictionaries:''
 	category:'Interface-Diff'
@@ -1724,6 +1724,12 @@
     "Created: / 20-11-2009 / 20:43:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+codeAspect
+    ^self codeAspectHolder value
+
+    "Created: / 04-04-2013 / 18:23:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 diffInfo
 
     ^self diffInfoHolder value
@@ -1886,12 +1892,14 @@
             labelBHolder: self versionBLabelHolder;
              textBHolder: self versionBTextHolder;
 
+            codeAspectHolder: self codeAspectHolder;
+
             yourself
     ].
     ^textDiff2App
 
     "Created: / 16-03-2012 / 13:58:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 17-01-2013 / 20:36:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 04-04-2013 / 18:17:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 textDiff3Tool
@@ -1906,16 +1914,18 @@
             labelBHolder: self versionBLabelHolder;
              textBHolder: self versionBTextHolder;
 
-
             labelAHolder: self versionALabelHolder;
              textAHolder: self versionATextHolder;
 
+            codeAspectHolder: self codeAspectHolder;
+
+
             yourself
     ].
     ^textDiff3App
 
     "Created: / 16-03-2012 / 15:16:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 17-01-2013 / 20:36:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 04-04-2013 / 18:17:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !ChangeSetDiffTool methodsFor:'accessing-subviews'!
@@ -1964,6 +1974,15 @@
     "Modified: / 17-01-2013 / 21:00:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+codeAspectHolder
+    "return/create the valueHolder 'codeAspectHolder'"
+
+    codeAspectHolder isNil ifTrue:[
+        codeAspectHolder := ValueHolder with:nil "defaultValue here".
+    ].
+    ^ codeAspectHolder
+!
+
 diffInfoHolder
     "return/create the 'diffInfoHolder' value holder (automatically generated)"