--- a/Diff3.st	Fri Apr 06 16:56:16 2012 +0100
+++ b/Diff3.st	Mon Apr 09 12:37:13 2012 +0100
@@ -150,8 +150,8 @@
     "Given a side (#left, #original or #right), returns the
     corresponding file"
 
-    side == #left       ifTrue:[ ^ file0 ].
-    side == #original   ifTrue:[ ^ file1 ].
+    side == #left       ifTrue:[ ^ file1 ].
+    side == #original   ifTrue:[ ^ file0 ].
     side == #right      ifTrue:[ ^ file2 ].
 
     self error:'Invalid parameter, must be one of #left, #original or #right'.
@@ -329,12 +329,13 @@
 
     conflict := Conflict new.
 
-    "/old := hunk oldChunk extractFrom: (self fileAt: hunk side).
+    old := hunk oldChunk extractFrom: file0.
     new := hunk newChunk extractFrom: (self fileAt: hunk side).
 
-    self computeConflictChunk: #left     fromCleanMerge: hunk old: old new: new into: conflict.
-    self computeConflictChunk: #original fromCleanMerge: hunk old: old new: new into: conflict.
-    self computeConflictChunk: #right    fromCleanMerge: hunk old: old new: new into: conflict.
+    conflict left: old.
+    conflict original: old.
+    conflict right: old.
+    conflict instVarNamed:hunk side put: hunk newChunk.
 
     ^conflict.
 
@@ -672,11 +673,6 @@
     "Created: / 06-04-2012 / 12:26:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-chunkAt: side
-
-    "Created: / 06-04-2012 / 12:25:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
 left
 	^ left
 !
@@ -810,5 +806,5 @@
 !Diff3 class methodsFor:'documentation'!
 
 version_SVN
-    ^ '$Id: Diff3.st 7973 2012-04-06 15:56:16Z vranyj1 $'
+    ^ '$Id: Diff3.st 7974 2012-04-09 11:37:13Z vranyj1 $'
 ! !