equal
deleted
inserted
replaced
|
1 " |
|
2 COPYRIGHT (c) 2012-2013 by Jan Vrany |
|
3 All Rights Reserved |
|
4 |
|
5 This software is furnished under a license and may be used |
|
6 only in accordance with the terms of that license and with the |
|
7 inclusion of the above copyright notice. This software may not |
|
8 be provided or otherwise made available to, or used by, any |
|
9 other person. No title to or ownership of the software is |
|
10 hereby transferred. |
|
11 " |
1 "{ Package: 'stx:libscm/mercurial' }" |
12 "{ Package: 'stx:libscm/mercurial' }" |
2 |
13 |
3 Object subclass:#HGMergeTool |
14 Object subclass:#HGMergeTool |
4 instanceVariableNames:'file' |
15 instanceVariableNames:'file' |
5 classVariableNames:'' |
16 classVariableNames:'' |
20 poolDictionaries:'' |
31 poolDictionaries:'' |
21 privateIn:HGMergeTool |
32 privateIn:HGMergeTool |
22 ! |
33 ! |
23 |
34 |
24 !HGMergeTool class methodsFor:'documentation'! |
35 !HGMergeTool class methodsFor:'documentation'! |
|
36 |
|
37 copyright |
|
38 " |
|
39 COPYRIGHT (c) 2012-2013 by Jan Vrany |
|
40 All Rights Reserved |
|
41 |
|
42 This software is furnished under a license and may be used |
|
43 only in accordance with the terms of that license and with the |
|
44 inclusion of the above copyright notice. This software may not |
|
45 be provided or otherwise made available to, or used by, any |
|
46 other person. No title to or ownership of the software is |
|
47 hereby transferred. |
|
48 " |
|
49 ! |
25 |
50 |
26 documentation |
51 documentation |
27 " |
52 " |
28 A base abstract class for merge tools. |
53 A base abstract class for merge tools. |
29 |
54 |
248 |
273 |
249 version_HG |
274 version_HG |
250 |
275 |
251 ^ '$Changeset: <not expanded> $' |
276 ^ '$Changeset: <not expanded> $' |
252 ! ! |
277 ! ! |
|
278 |