equal
deleted
inserted
replaced
594 ! ! |
594 ! ! |
595 |
595 |
596 !SmalltalkMergeTool::DiffItem class methodsFor:'documentation'! |
596 !SmalltalkMergeTool::DiffItem class methodsFor:'documentation'! |
597 |
597 |
598 version |
598 version |
599 ^'$Id: Tools__SmalltalkMergeTool.st 7925 2012-03-16 17:08:17Z vranyj1 $' |
599 ^'$Header: /cvs/stx/stx/libtool/Tools__SmalltalkMergeTool.st,v 1.3 2014-02-05 18:58:07 cg Exp $' |
600 ! ! |
600 ! ! |
601 |
601 |
602 !SmalltalkMergeTool::DiffItem class methodsFor:'image specs'! |
602 !SmalltalkMergeTool::DiffItem class methodsFor:'image specs'! |
603 |
603 |
604 resolvedAsRemoveIcon |
604 resolvedAsRemoveIcon |
898 ! ! |
898 ! ! |
899 |
899 |
900 !SmalltalkMergeTool class methodsFor:'documentation'! |
900 !SmalltalkMergeTool class methodsFor:'documentation'! |
901 |
901 |
902 version_CVS |
902 version_CVS |
903 ^ '§Header: /cvs/stx/stx/libtool/Tools__SmalltalkMergeTool.st,v 1.2 2011/07/03 20:56:26 cg Exp §' |
903 ^ '$Header: /cvs/stx/stx/libtool/Tools__SmalltalkMergeTool.st,v 1.3 2014-02-05 18:58:07 cg Exp $' |
904 ! |
|
905 |
|
906 version_HG |
|
907 |
|
908 ^ '$Changeset: <not expanded> $' |
|
909 ! |
904 ! |
910 |
905 |
911 version_SVN |
906 version_SVN |
912 ^ '$Id: Tools__SmalltalkMergeTool.st 7925 2012-03-16 17:08:17Z vranyj1 $' |
907 ^ '$Id: Tools__SmalltalkMergeTool.st,v 1.3 2014-02-05 18:58:07 cg Exp $' |
913 ! ! |
908 ! ! |
914 |
909 |
915 |
910 |
916 SmalltalkMergeTool initialize! |
911 SmalltalkMergeTool initialize! |