equal
deleted
inserted
replaced
15 You should have received a copy of the GNU Lesser General Public |
15 You should have received a copy of the GNU Lesser General Public |
16 License along with this library; if not, write to the Free Software |
16 License along with this library; if not, write to the Free Software |
17 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
17 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
18 " |
18 " |
19 "{ Package: 'stx:libscm/mercurial' }" |
19 "{ Package: 'stx:libscm/mercurial' }" |
|
20 |
|
21 "{ NameSpace: Smalltalk }" |
20 |
22 |
21 Object subclass:#HGMergeTool |
23 Object subclass:#HGMergeTool |
22 instanceVariableNames:'file' |
24 instanceVariableNames:'file' |
23 classVariableNames:'' |
25 classVariableNames:'' |
24 poolDictionaries:'' |
26 poolDictionaries:'' |
286 "Created: / 14-01-2013 / 21:15:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
288 "Created: / 14-01-2013 / 21:15:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
287 ! ! |
289 ! ! |
288 |
290 |
289 !HGMergeTool class methodsFor:'documentation'! |
291 !HGMergeTool class methodsFor:'documentation'! |
290 |
292 |
|
293 version_CVS |
|
294 ^ '$Header$' |
|
295 ! |
|
296 |
291 version_HG |
297 version_HG |
292 |
298 |
293 ^ '$Changeset: <not expanded> $' |
299 ^ '$Changeset: <not expanded> $' |
294 ! ! |
300 ! ! |
295 |
301 |