--- a/Tools__SmalltalkMergeTool.st Wed Feb 05 19:58:05 2014 +0100
+++ b/Tools__SmalltalkMergeTool.st Wed Feb 05 19:58:07 2014 +0100
@@ -1,3 +1,14 @@
+"
+ COPYRIGHT (c) 2006 by eXept Software AG
+ 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
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
"{ Package: 'stx:libtool' }"
"{ NameSpace: Tools }"
@@ -18,6 +29,20 @@
!SmalltalkMergeTool class methodsFor:'documentation'!
+copyright
+"
+ COPYRIGHT (c) 2006 by eXept Software AG
+ 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
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
+!
+
documentation
"
documentation to be added.
@@ -571,7 +596,7 @@
!SmalltalkMergeTool::DiffItem class methodsFor:'documentation'!
version
- ^'$Id: Tools__SmalltalkMergeTool.st,v 1.2 2011-07-03 20:56:26 cg Exp $'
+ ^'$Header: /cvs/stx/stx/libtool/Tools__SmalltalkMergeTool.st,v 1.3 2014-02-05 18:58:07 cg Exp $'
! !
!SmalltalkMergeTool::DiffItem class methodsFor:'image specs'!
@@ -875,11 +900,12 @@
!SmalltalkMergeTool class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__SmalltalkMergeTool.st,v 1.2 2011-07-03 20:56:26 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__SmalltalkMergeTool.st,v 1.3 2014-02-05 18:58:07 cg Exp $'
!
version_SVN
- ^ '§Id: Tools__SmalltalkMergeTool.st 7486 2009-10-26 22:06:24Z vranyj1 §'
+ ^ '$Id: Tools__SmalltalkMergeTool.st,v 1.3 2014-02-05 18:58:07 cg Exp $'
! !
+
SmalltalkMergeTool initialize!