equal
deleted
inserted
replaced
108 for t in merge_regions: |
108 for t in merge_regions: |
109 what = t[0] |
109 what = t[0] |
110 if what == 'unchanged': |
110 if what == 'unchanged': |
111 for i in range(t[1], t[2]): |
111 for i in range(t[1], t[2]): |
112 yield self.base[i] |
112 yield self.base[i] |
113 elif what in ('a', 'same'): |
113 elif what == 'a' or what == 'same': |
114 for i in range(t[1], t[2]): |
114 for i in range(t[1], t[2]): |
115 yield self.a[i] |
115 yield self.a[i] |
116 elif what == 'b': |
116 elif what == 'b': |
117 for i in range(t[1], t[2]): |
117 for i in range(t[1], t[2]): |
118 yield self.b[i] |
118 yield self.b[i] |
140 for t in self.merge_regions(): |
140 for t in self.merge_regions(): |
141 what = t[0] |
141 what = t[0] |
142 if what == 'unchanged': |
142 if what == 'unchanged': |
143 for i in range(t[1], t[2]): |
143 for i in range(t[1], t[2]): |
144 yield 'u | ' + self.base[i] |
144 yield 'u | ' + self.base[i] |
145 elif what in ('a', 'same'): |
145 elif what == 'a' or what == 'same': |
146 for i in range(t[1], t[2]): |
146 for i in range(t[1], t[2]): |
147 yield what[0] + ' | ' + self.a[i] |
147 yield what[0] + ' | ' + self.a[i] |
148 elif what == 'b': |
148 elif what == 'b': |
149 for i in range(t[1], t[2]): |
149 for i in range(t[1], t[2]): |
150 yield 'b | ' + self.b[i] |
150 yield 'b | ' + self.b[i] |
179 """ |
179 """ |
180 for t in self.merge_regions(): |
180 for t in self.merge_regions(): |
181 what = t[0] |
181 what = t[0] |
182 if what == 'unchanged': |
182 if what == 'unchanged': |
183 yield what, self.base[t[1]:t[2]] |
183 yield what, self.base[t[1]:t[2]] |
184 elif what in ('a', 'same'): |
184 elif what == 'a' or what == 'same': |
185 yield what, self.a[t[1]:t[2]] |
185 yield what, self.a[t[1]:t[2]] |
186 elif what == 'b': |
186 elif what == 'b': |
187 yield what, self.b[t[1]:t[2]] |
187 yield what, self.b[t[1]:t[2]] |
188 elif what == 'conflict': |
188 elif what == 'conflict': |
189 yield (what, |
189 yield (what, |