Bugfix in merge tool.
Due to a bug, even an unmerged code has been treated as merged and wrong
.st file has been written (with <conflict> lines. This commit should fix this problem.
"
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 }"
GenericToolbox subclass:#SmalltalkToolbox
instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
category:'Interface-Tools'
!
!SmalltalkToolbox 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
"
A toolbox for Smalltalk language
[author:]
Jan Vrany <jan.vrany@fit.cvut.cz>
[instance variables:]
[class variables:]
[see also:]
Tools::Toolbox
Tools::GenericToolbox
"
! !
!SmalltalkToolbox class methodsFor:'documentation'!
version
^ '$Header: /cvs/stx/stx/libtool/Tools__SmalltalkToolbox.st,v 1.1 2014-02-24 16:08:50 vrany Exp $'
!
version_CVS
^ '$Header: /cvs/stx/stx/libtool/Tools__SmalltalkToolbox.st,v 1.1 2014-02-24 16:08:50 vrany Exp $'
! !