##// END OF EJS Templates
spelling: sentinel
timeless@mozdev.org -
r17513:d08b3338 default
parent child Browse files
Show More
@@ -138,7 +138,7 b' class TestMerge3(TestCase):'
138 ['aaa', 'bbb', 'zz'],
138 ['aaa', 'bbb', 'zz'],
139 ['zz'])
139 ['zz'])
140
140
141 # todo: should use a sentinal at end as from get_matching_blocks
141 # todo: should use a sentinel at end as from get_matching_blocks
142 # to match without zz
142 # to match without zz
143 self.assertEquals(list(m3.find_sync_regions()),
143 self.assertEquals(list(m3.find_sync_regions()),
144 [(0, 1, 2, 3, 0, 1),
144 [(0, 1, 2, 3, 0, 1),
@@ -156,7 +156,7 b' class TestMerge3(TestCase):'
156 m3 = Merge3([],
156 m3 = Merge3([],
157 ['aaa', 'bbb'],
157 ['aaa', 'bbb'],
158 [])
158 [])
159 # todo: should use a sentinal at end as from get_matching_blocks
159 # todo: should use a sentinel at end as from get_matching_blocks
160 # to match without zz
160 # to match without zz
161 self.assertEquals(list(m3.find_sync_regions()),
161 self.assertEquals(list(m3.find_sync_regions()),
162 [(0, 0, 2, 2, 0, 0)])
162 [(0, 0, 2, 2, 0, 0)])
General Comments 0
You need to be logged in to leave comments. Login now