author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Fri, 16 Mar 2012 17:08:17 +0000 | |
branch | jv |
changeset 12179 | 47f98e7d6de1 |
child 12190 | 2a77dea2eceb |
permissions | -rw-r--r-- |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
2 |
COPYRIGHT (c) 2006 by eXept Software AG |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
3 |
All Rights Reserved |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
4 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
5 |
This software is furnished under a license and may be used |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
6 |
only in accordance with the terms of that license and with the |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
7 |
inclusion of the above copyright notice. This software may not |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
8 |
be provided or otherwise made available to, or used by, any |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
9 |
other person. No title to or ownership of the software is |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
10 |
hereby transferred. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
11 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
12 |
"{ Package: 'stx:libtool' }" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
13 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
14 |
"{ NameSpace: Tools }" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
15 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
16 |
DiffCodeView2 subclass:#Diff3CodeView2 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
17 |
instanceVariableNames:'' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
18 |
classVariableNames:'' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
19 |
poolDictionaries:'' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
20 |
category:'Interface-CodeView' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
21 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
22 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
23 |
Object subclass:#Diff3Data |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
24 |
instanceVariableNames:'text1 text2 text3 inserted deleted changed' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
25 |
classVariableNames:'' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
26 |
poolDictionaries:'' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
27 |
privateIn:Diff3CodeView2 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
28 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
29 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
30 |
!Diff3CodeView2 class methodsFor:'documentation'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
31 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
32 |
copyright |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
33 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
34 |
COPYRIGHT (c) 2006 by eXept Software AG |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
35 |
All Rights Reserved |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
36 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
37 |
This software is furnished under a license and may be used |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
38 |
only in accordance with the terms of that license and with the |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
39 |
inclusion of the above copyright notice. This software may not |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
40 |
be provided or otherwise made available to, or used by, any |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
41 |
other person. No title to or ownership of the software is |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
42 |
hereby transferred. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
43 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
44 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
45 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
46 |
!Diff3CodeView2 class methodsFor:'defaults'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
47 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
48 |
numberOfViews |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
49 |
"return the number of the synced subViews. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
50 |
Usually redefined in subclasses" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
51 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
52 |
^ 3 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
53 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
54 |
"Created: / 16-03-2012 / 12:56:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
55 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
56 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
57 |
!Diff3CodeView2 methodsFor:'accessing'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
58 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
59 |
text1:t1 text2:t2 text3: t3 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
60 |
|data| |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
61 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
62 |
textViews first contents: t1. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
63 |
textViews second contents: t2. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
64 |
textViews third contents: t3. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
65 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
66 |
"Should be (once implemented)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
67 |
"/ data := self computeDiffDataForText1:t1 text2:t2 text3: t3. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
68 |
"/ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
69 |
"/ (textViews at:1) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
70 |
"/ contents:(data text1); |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
71 |
"/ deletedLines:(data deleted); |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
72 |
"/ changedLines:(data changed); |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
73 |
"/ insertedLines:#(); |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
74 |
"/ originDiffText:t1; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
75 |
"/ emptyLines:(data inserted). |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
76 |
"/ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
77 |
"/ (textViews at:2) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
78 |
"/ contents:(data text2); |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
79 |
"/ deletedLines:#(); |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
80 |
"/ changedLines:(data changed); |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
81 |
"/ insertedLines:(data inserted); |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
82 |
"/ originDiffText:t2; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
83 |
"/ emptyLines:(data deleted). |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
84 |
"/ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
85 |
"/ (textViews at:3) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
86 |
"/ contents:(data text3); |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
87 |
"/ deletedLines:#(); |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
88 |
"/ changedLines:(data changed); |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
89 |
"/ insertedLines:(data inserted); |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
90 |
"/ originDiffText:t3; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
91 |
"/ emptyLines:(data deleted). |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
92 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
93 |
"Modified: / 22-06-2010 / 21:36:35 / Jakub <zelenja7@fel.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
94 |
"Created: / 16-03-2012 / 12:58:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
95 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
96 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
97 |
!Diff3CodeView2::Diff3Data methodsFor:'accessing'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
98 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
99 |
changed |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
100 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
101 |
^changed copy |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
102 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
103 |
"Modified: / 02-05-2010 / 19:31:18 / Jakub <zelenja7@fel.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
104 |
"Modified: / 16-07-2010 / 09:35:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
105 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
106 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
107 |
changed:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
108 |
changed := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
109 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
110 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
111 |
deleted |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
112 |
^ deleted |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
113 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
114 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
115 |
deleted:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
116 |
deleted := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
117 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
118 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
119 |
inserted |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
120 |
^ inserted |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
121 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
122 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
123 |
inserted:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
124 |
inserted := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
125 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
126 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
127 |
text1 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
128 |
^ text1 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
129 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
130 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
131 |
text1:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
132 |
text1 := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
133 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
134 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
135 |
text2 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
136 |
^ text2 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
137 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
138 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
139 |
text2:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
140 |
text2 := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
141 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
142 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
143 |
text3 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
144 |
^ text3 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
145 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
146 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
147 |
text3:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
148 |
text3 := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
149 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
150 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
151 |
!Diff3CodeView2 class methodsFor:'documentation'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
152 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
153 |
version_SVN |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
154 |
^ '$Id: Tools__Diff3CodeView2.st 7925 2012-03-16 17:08:17Z vranyj1 $' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
155 |
! ! |