mercurial/HGMergeTool.st
changeset 210 54a73fa50d40
parent 182 e58f54764529
child 235 3d8ef499d7d9
--- a/mercurial/HGMergeTool.st	Tue Jan 29 16:35:29 2013 +0000
+++ b/mercurial/HGMergeTool.st	Fri Feb 01 12:02:22 2013 +0000
@@ -1,3 +1,14 @@
+"
+ COPYRIGHT (c) 2012-2013 by Jan Vrany
+              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:libscm/mercurial' }"
 
 Object subclass:#HGMergeTool
@@ -23,6 +34,20 @@
 
 !HGMergeTool class methodsFor:'documentation'!
 
+copyright
+"
+ COPYRIGHT (c) 2012-2013 by Jan Vrany
+              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
 "
     A base abstract class for merge tools.
@@ -250,3 +275,4 @@
 
     ^ '$Changeset: <not expanded> $'
 ! !
+