--- a/Tools__Diff3CodeView2.st	Fri Apr 06 16:56:16 2012 +0100
+++ b/Tools__Diff3CodeView2.st	Mon Apr 09 12:37:13 2012 +0100
@@ -183,6 +183,20 @@
 
 !Diff3CodeView2::Diff3Data methodsFor:'computing'!
 
+addLines: total from: src to: dst chunk: chunk
+
+    ^chunk isSequenceable ifTrue:[
+        dst addAll: chunk.
+        (total - chunk size) timesRepeat: [
+            dst add: nil.
+        ]
+    ] ifFalse:[
+        self addLines: total from: src to: dst offset: chunk offset length: chunk length.
+    ]
+
+    "Created: / 09-04-2012 / 11:54:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 addLines: total from: src to: dst offset: offset length: len
     | start stop |
 
@@ -236,9 +250,9 @@
 
         len := chunk length.
         chunk isConflict ifTrue:[
-            self addLines: len from: t1c to: list1 offset: chunk original offset length: chunk original length.
-            self addLines: len from: t2c to: list2 offset: chunk left     offset length: chunk left     length.
-            self addLines: len from: t3c to: list3 offset: chunk right    offset length: chunk right    length.
+            self addLines: len from: t1c to: list1 chunk: chunk original.
+            self addLines: len from: t2c to: list2 chunk: chunk left.
+            self addLines: len from: t3c to: list3 chunk: chunk right.
             chunk isInsertionInOriginal ifTrue:[
                 lnr to:(lnr + len -1) do:[:i|inserted1 add: i].
             ] ifFalse:[chunk isInsertionInLeft ifTrue:[
@@ -349,5 +363,5 @@
 !Diff3CodeView2 class methodsFor:'documentation'!
 
 version_SVN
-    ^ '$Id: Tools__Diff3CodeView2.st 7948 2012-03-21 01:52:35Z vranyj1 $'
+    ^ '$Id: Tools__Diff3CodeView2.st 7974 2012-04-09 11:37:13Z vranyj1 $'
 ! !