equal
deleted
inserted
replaced
212 name_b='b', |
212 name_b='b', |
213 start_marker='<<', |
213 start_marker='<<', |
214 mid_marker='--', |
214 mid_marker='--', |
215 end_marker='>>') |
215 end_marker='>>') |
216 self.assertEquals(''.join(ml), |
216 self.assertEquals(''.join(ml), |
217 '''\ |
217 'aaa\n' |
218 aaa |
218 'bbb\n' |
219 bbb |
219 '<< a\n' |
220 << a |
220 '222\n' |
221 222 |
221 '--\n' |
222 -- |
222 '333\n' |
223 333 |
223 '>> b\n' |
224 >> b |
224 ) |
225 ''') |
|
226 |
225 |
227 def test_insert_agreement(self): |
226 def test_insert_agreement(self): |
228 m3 = Merge3(['aaa\n', 'bbb\n'], |
227 m3 = Merge3(['aaa\n', 'bbb\n'], |
229 ['aaa\n', '222\n', 'bbb\n'], |
228 ['aaa\n', '222\n', 'bbb\n'], |
230 ['aaa\n', '222\n', 'bbb\n']) |
229 ['aaa\n', '222\n', 'bbb\n']) |