--- a/Diff3TextView.st	Tue Dec 12 14:35:03 1995 +0100
+++ b/Diff3TextView.st	Tue Dec 12 14:47:12 1995 +0100
@@ -1,6 +1,6 @@
 "
- COPYRIGHT (c) 1994 by Claus Gittinger
-	      All Rights Reserved
+ COPYRIGHT (c) 1995 by Claus Gittinger
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -22,8 +22,8 @@
 
 copyright
 "
- COPYRIGHT (c) 1994 by Claus Gittinger
-	      All Rights Reserved
+ COPYRIGHT (c) 1995 by Claus Gittinger
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -36,15 +36,15 @@
 
 documentation
 "
-    a view showing diff (see unix manual pages) output in a 
+    a view showing merged diff3 (see rcsmerge / merge unix manual pages) output in a 
     user-friendly form.
     The view is created and opened with:
 
-       d := DiffTextView openOn:text1 and:text2.
+       d := Diff3TextView openOn:text label:l1 label:l2 label:l3.
 
-    and it will show the differences side-by-side
-    For a real world application, see the ChangesBrowsers
-    compare function.
+    and it will show the 3 versions side-by-side
+    Its main use is for the SourceCodeManager, to show merged sources after
+    a failed checkin.
 "
 ! !
 
@@ -86,15 +86,6 @@
     "Modified: 12.12.1995 / 13:09:13 / cg"
 ! !
 
-!Diff3TextView class methodsFor:'defaults'!
-
-diffCommand
-    ^ 'diff3 -b'
-
-    "Created: 12.12.1995 / 12:25:29 / cg"
-    "Modified: 12.12.1995 / 12:25:39 / cg"
-! !
-
 !Diff3TextView methodsFor:'initialization'!
 
 initStyle
@@ -240,5 +231,5 @@
 !Diff3TextView class methodsFor:'documentation'!
 
 version
-^ '$Header: /cvs/stx/stx/libtool/Diff3TextView.st,v 1.1 1995-12-12 12:22:20 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Diff3TextView.st,v 1.2 1995-12-12 13:47:12 cg Exp $'
 ! !