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:#HGMergeInfo |
14 Object subclass:#HGMergeInfo |
4 instanceVariableNames:'numUpdated numMerged numRemoved numUnresolved' |
15 instanceVariableNames:'numUpdated numMerged numRemoved numUnresolved' |
5 classVariableNames:'' |
16 classVariableNames:'' |
6 poolDictionaries:'' |
17 poolDictionaries:'' |
7 category:'SCM-Mercurial-Core' |
18 category:'SCM-Mercurial-Core' |
8 ! |
19 ! |
9 |
20 |
|
21 !HGMergeInfo class methodsFor:'documentation'! |
|
22 |
|
23 copyright |
|
24 " |
|
25 COPYRIGHT (c) 2012-2013 by Jan Vrany |
|
26 All Rights Reserved |
|
27 |
|
28 This software is furnished under a license and may be used |
|
29 only in accordance with the terms of that license and with the |
|
30 inclusion of the above copyright notice. This software may not |
|
31 be provided or otherwise made available to, or used by, any |
|
32 other person. No title to or ownership of the software is |
|
33 hereby transferred. |
|
34 " |
|
35 ! ! |
10 |
36 |
11 !HGMergeInfo methodsFor:'accessing'! |
37 !HGMergeInfo methodsFor:'accessing'! |
12 |
38 |
13 numMerged |
39 numMerged |
14 ^ numMerged |
40 ^ numMerged |
56 |
82 |
57 version_HG |
83 version_HG |
58 |
84 |
59 ^ '$Changeset: <not expanded> $' |
85 ^ '$Changeset: <not expanded> $' |
60 ! ! |
86 ! ! |
|
87 |