equal
deleted
inserted
replaced
127 "Created: / 20-03-2012 / 10:23:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
127 "Created: / 20-03-2012 / 10:23:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
128 ! |
128 ! |
129 |
129 |
130 isMerge |
130 isMerge |
131 |
131 |
132 ^specBase notNil and:[specMerge notNil] |
132 ^ |
|
133 "/ specBase notNil and:[ |
|
134 specMerge notNil |
|
135 "/ ] |
133 |
136 |
134 "Created: / 20-03-2012 / 10:23:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
137 "Created: / 20-03-2012 / 10:23:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
135 ! ! |
138 ! ! |
136 |
139 |
137 !ChangeSetDiffInfo methodsFor:'read / write'! |
140 !ChangeSetDiffInfo methodsFor:'read / write'! |
152 ! ! |
155 ! ! |
153 |
156 |
154 !ChangeSetDiffInfo class methodsFor:'documentation'! |
157 !ChangeSetDiffInfo class methodsFor:'documentation'! |
155 |
158 |
156 version_SVN |
159 version_SVN |
157 ^ '$Id: Tools__ChangeSetDiffInfo.st 7947 2012-03-20 16:59:54Z vranyj1 $' |
160 ^ '$Id: Tools__ChangeSetDiffInfo.st 8036 2012-08-03 15:14:04Z vranyj1 $' |
158 ! ! |
161 ! ! |